Бранимир Караџић hace 3 años
padre
commit
6a1e41d3ba

+ 0 - 2
include/bx/error.h

@@ -38,7 +38,6 @@ namespace bx
 	{
 	{
 		BX_CLASS(Error
 		BX_CLASS(Error
 			, NO_COPY
 			, NO_COPY
-			, NO_COPY_ASSIGNMENT
 			);
 			);
 
 
 	public:
 	public:
@@ -107,7 +106,6 @@ namespace bx
 		BX_CLASS(ErrorScope
 		BX_CLASS(ErrorScope
 			, NO_DEFAULT_CTOR
 			, NO_DEFAULT_CTOR
 			, NO_COPY
 			, NO_COPY
-			, NO_COPY_ASSIGNMENT
 			);
 			);
 
 
 	public:
 	public:

+ 10 - 2
include/bx/macros.h

@@ -197,16 +197,24 @@
 #	define BX_PRAGMA_DIAGNOSTIC_IGNORED_CLANG_GCC(_x)
 #	define BX_PRAGMA_DIAGNOSTIC_IGNORED_CLANG_GCC(_x)
 #endif // BX_COMPILER_
 #endif // BX_COMPILER_
 
 
-///
+/// No default constructor.
 #define BX_CLASS_NO_DEFAULT_CTOR(_class) \
 #define BX_CLASS_NO_DEFAULT_CTOR(_class) \
 	_class() = delete
 	_class() = delete
 
 
-#define BX_CLASS_NO_COPY(_class) \
+/// No copy constructor.
+#define BX_CLASS_NO_COPY_CTOR(_class) \
 	_class(const _class& _rhs) = delete
 	_class(const _class& _rhs) = delete
 
 
+/// No copy assignment operator.
 #define BX_CLASS_NO_COPY_ASSIGNMENT(_class) \
 #define BX_CLASS_NO_COPY_ASSIGNMENT(_class) \
 	_class& operator=(const _class& _rhs) = delete
 	_class& operator=(const _class& _rhs) = delete
 
 
+/// No copy construcor, and copy assignment operator.
+#define BX_CLASS_NO_COPY(_class)   \
+	BX_CLASS_NO_COPY_CTOR(_class); \
+	BX_CLASS_NO_COPY_ASSIGNMENT(_class)
+
+///
 #define BX_CLASS_ALLOCATOR(_class)              \
 #define BX_CLASS_ALLOCATOR(_class)              \
 	public: void* operator new(size_t _size);   \
 	public: void* operator new(size_t _size);   \
 	public: void  operator delete(void* _ptr);  \
 	public: void  operator delete(void* _ptr);  \

+ 0 - 2
include/bx/mpscqueue.h

@@ -19,7 +19,6 @@ namespace bx
 		BX_CLASS(MpScUnboundedQueueT
 		BX_CLASS(MpScUnboundedQueueT
 			, NO_DEFAULT_CTOR
 			, NO_DEFAULT_CTOR
 			, NO_COPY
 			, NO_COPY
-			, NO_COPY_ASSIGNMENT
 			);
 			);
 
 
 	public:
 	public:
@@ -50,7 +49,6 @@ namespace bx
 		BX_CLASS(MpScUnboundedBlockingQueue
 		BX_CLASS(MpScUnboundedBlockingQueue
 			, NO_DEFAULT_CTOR
 			, NO_DEFAULT_CTOR
 			, NO_COPY
 			, NO_COPY
-			, NO_COPY_ASSIGNMENT
 			);
 			);
 
 
 	public:
 	public:

+ 0 - 2
include/bx/mutex.h

@@ -15,7 +15,6 @@ namespace bx
 	{
 	{
 		BX_CLASS(Mutex
 		BX_CLASS(Mutex
 			, NO_COPY
 			, NO_COPY
-			, NO_COPY_ASSIGNMENT
 			);
 			);
 
 
 	public:
 	public:
@@ -41,7 +40,6 @@ namespace bx
 		BX_CLASS(MutexScope
 		BX_CLASS(MutexScope
 			, NO_DEFAULT_CTOR
 			, NO_DEFAULT_CTOR
 			, NO_COPY
 			, NO_COPY
-			, NO_COPY_ASSIGNMENT
 			);
 			);
 
 
 	public:
 	public:

+ 0 - 4
include/bx/ringbuffer.h

@@ -18,7 +18,6 @@ namespace bx
 		BX_CLASS(RingBufferControl
 		BX_CLASS(RingBufferControl
 			, NO_DEFAULT_CTOR
 			, NO_DEFAULT_CTOR
 			, NO_COPY
 			, NO_COPY
-			, NO_COPY_ASSIGNMENT
 			);
 			);
 
 
 	public:
 	public:
@@ -58,7 +57,6 @@ namespace bx
 		BX_CLASS(SpScRingBufferControl
 		BX_CLASS(SpScRingBufferControl
 			, NO_DEFAULT_CTOR
 			, NO_DEFAULT_CTOR
 			, NO_COPY
 			, NO_COPY
-			, NO_COPY_ASSIGNMENT
 			);
 			);
 
 
 	public:
 	public:
@@ -99,7 +97,6 @@ namespace bx
 		BX_CLASS(ReadRingBufferT
 		BX_CLASS(ReadRingBufferT
 			, NO_DEFAULT_CTOR
 			, NO_DEFAULT_CTOR
 			, NO_COPY
 			, NO_COPY
-			, NO_COPY_ASSIGNMENT
 			);
 			);
 
 
 	public:
 	public:
@@ -142,7 +139,6 @@ namespace bx
 		BX_CLASS(WriteRingBufferT
 		BX_CLASS(WriteRingBufferT
 			, NO_DEFAULT_CTOR
 			, NO_DEFAULT_CTOR
 			, NO_COPY
 			, NO_COPY
-			, NO_COPY_ASSIGNMENT
 			);
 			);
 
 
 	public:
 	public:

+ 0 - 1
include/bx/semaphore.h

@@ -15,7 +15,6 @@ namespace bx
 	{
 	{
 		BX_CLASS(Semaphore
 		BX_CLASS(Semaphore
 			, NO_COPY
 			, NO_COPY
-			, NO_COPY_ASSIGNMENT
 			);
 			);
 
 
 	public:
 	public:

+ 0 - 4
include/bx/spscqueue.h

@@ -18,7 +18,6 @@ namespace bx
 		BX_CLASS(SpScUnboundedQueue
 		BX_CLASS(SpScUnboundedQueue
 			, NO_DEFAULT_CTOR
 			, NO_DEFAULT_CTOR
 			, NO_COPY
 			, NO_COPY
-			, NO_COPY_ASSIGNMENT
 			);
 			);
 
 
 	public:
 	public:
@@ -60,7 +59,6 @@ namespace bx
 		BX_CLASS(SpScUnboundedQueueT
 		BX_CLASS(SpScUnboundedQueueT
 			, NO_DEFAULT_CTOR
 			, NO_DEFAULT_CTOR
 			, NO_COPY
 			, NO_COPY
-			, NO_COPY_ASSIGNMENT
 			);
 			);
 
 
 	public:
 	public:
@@ -90,7 +88,6 @@ namespace bx
 		BX_CLASS(SpScBlockingUnboundedQueue
 		BX_CLASS(SpScBlockingUnboundedQueue
 			, NO_DEFAULT_CTOR
 			, NO_DEFAULT_CTOR
 			, NO_COPY
 			, NO_COPY
-			, NO_COPY_ASSIGNMENT
 			);
 			);
 
 
 	public:
 	public:
@@ -121,7 +118,6 @@ namespace bx
 		BX_CLASS(SpScBlockingUnboundedQueueT
 		BX_CLASS(SpScBlockingUnboundedQueueT
 			, NO_DEFAULT_CTOR
 			, NO_DEFAULT_CTOR
 			, NO_COPY
 			, NO_COPY
-			, NO_COPY_ASSIGNMENT
 			);
 			);
 
 
 	public:
 	public:

+ 0 - 1
include/bx/thread.h

@@ -21,7 +21,6 @@ namespace bx
 	{
 	{
 		BX_CLASS(Thread
 		BX_CLASS(Thread
 			, NO_COPY
 			, NO_COPY
-			, NO_COPY_ASSIGNMENT
 			);
 			);
 
 
 	public:
 	public: