diff options
-rw-r--r-- | ace/CORBA_Handler.h | 4 | ||||
-rw-r--r-- | ace/Free_List.h | 4 | ||||
-rw-r--r-- | ace/IOStream_T.h | 8 | ||||
-rw-r--r-- | ace/Local_Tokens.h | 4 | ||||
-rw-r--r-- | ace/Log_Msg.h | 4 | ||||
-rw-r--r-- | ace/Managed_Object.h | 7 | ||||
-rw-r--r-- | ace/Map_Manager.h | 4 | ||||
-rw-r--r-- | ace/Mem_Map.h | 4 | ||||
-rw-r--r-- | ace/Message_Block.h | 8 | ||||
-rw-r--r-- | ace/Message_Queue.h | 4 | ||||
-rw-r--r-- | ace/OS.h | 10 | ||||
-rw-r--r-- | ace/Object_Manager.h | 4 | ||||
-rw-r--r-- | ace/Priority_Reactor.h | 4 | ||||
-rw-r--r-- | ace/Reactor.h | 4 | ||||
-rw-r--r-- | ace/Read_Buffer.h | 6 | ||||
-rw-r--r-- | ace/Registry.h | 4 | ||||
-rw-r--r-- | ace/Remote_Tokens.h | 4 | ||||
-rw-r--r-- | ace/Select_Reactor.h | 4 | ||||
-rw-r--r-- | ace/Synch.h | 52 | ||||
-rw-r--r-- | ace/Synch_T.h | 16 | ||||
-rw-r--r-- | ace/Task.h | 4 | ||||
-rw-r--r-- | ace/Task_T.h | 4 | ||||
-rw-r--r-- | ace/Timer_Hash_T.h | 8 | ||||
-rw-r--r-- | ace/Timer_Heap_T.h | 4 | ||||
-rw-r--r-- | ace/Timer_List_T.h | 4 | ||||
-rw-r--r-- | ace/Timer_Queue_T.h | 4 | ||||
-rw-r--r-- | ace/Timer_Wheel_T.h | 4 | ||||
-rw-r--r-- | ace/WFMO_Reactor.h | 4 | ||||
-rw-r--r-- | ace/XtReactor.h | 4 |
29 files changed, 99 insertions, 100 deletions
diff --git a/ace/CORBA_Handler.h b/ace/CORBA_Handler.h index 6977a12628e..19791d6deac 100644 --- a/ace/CORBA_Handler.h +++ b/ace/CORBA_Handler.h @@ -87,8 +87,8 @@ protected: private: // = Disallow assignment and initialization. - ACE_UNIMPLEMENTED_FUNC (ACE_CORBA_Handler (const ACE_CORBA_Handler &rhs)) - ACE_UNIMPLEMENTED_FUNC (const ACE_CORBA_Handler &operator= (const ACE_CORBA_Handler &rhs)) + ACE_CORBA_Handler (const ACE_CORBA_Handler &rhs); + const ACE_CORBA_Handler &operator= (const ACE_CORBA_Handler &rhs); }; class ACE_Export ACE_ST_CORBA_Handler : public ACE_CORBA_Handler diff --git a/ace/Free_List.h b/ace/Free_List.h index 61724fa3eea..723868d8db7 100644 --- a/ace/Free_List.h +++ b/ace/Free_List.h @@ -118,8 +118,8 @@ protected: private: // = Don't allow these operations for now. - ACE_UNIMPLEMENTED_FUNC (ACE_Locked_Free_List (const ACE_Locked_Free_List<T, ACE_LOCK> &)) - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Locked_Free_List<T, ACE_LOCK> &)) + ACE_UNIMPLEMENTED_FUNC (ACE_Locked_Free_List (const ACE_Locked_Free_List<T, ACE_LOCK> &)); + ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Locked_Free_List<T, ACE_LOCK> &)); }; #if defined (__ACE_INLINE__) diff --git a/ace/IOStream_T.h b/ace/IOStream_T.h index 1f58c0ea2ce..674dddc8811 100644 --- a/ace/IOStream_T.h +++ b/ace/IOStream_T.h @@ -168,10 +168,10 @@ private: // streambuf_ will be buffering IO on the STREAM object. If these // functions were used in your program, there is a danger of getting // the datastream out of sync. - ACE_UNIMPLEMENTED_FUNC (ssize_t send (...)) - ACE_UNIMPLEMENTED_FUNC (ssize_t recv (...)) - ACE_UNIMPLEMENTED_FUNC (ssize_t send_n (...)) - ACE_UNIMPLEMENTED_FUNC (ssize_t recv_n (...)) + ACE_UNIMPLEMENTED_FUNC (ssize_t send (...)); + ACE_UNIMPLEMENTED_FUNC (ssize_t recv (...)); + ACE_UNIMPLEMENTED_FUNC (ssize_t send_n (...)); + ACE_UNIMPLEMENTED_FUNC (ssize_t recv_n (...)); }; template <class STREAM> diff --git a/ace/Local_Tokens.h b/ace/Local_Tokens.h index 3adf1221d02..53bc1680981 100644 --- a/ace/Local_Tokens.h +++ b/ace/Local_Tokens.h @@ -196,8 +196,8 @@ public: #endif /* ACE_NO_TSS_TOKENS */ private: - ACE_UNIMPLEMENTED_FUNC (ACE_TSS_TPQ_Entry (const ACE_TSS_TPQ_Entry &)) - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_TSS_TPQ_Entry &)) + ACE_TSS_TPQ_Entry (const ACE_TSS_TPQ_Entry &); + void operator= (const ACE_TSS_TPQ_Entry &); // Private: should not be used // = These are passed to the constructor of ACE_TPQ_Entry in diff --git a/ace/Log_Msg.h b/ace/Log_Msg.h index 7cf52f82598..0f032b7b357 100644 --- a/ace/Log_Msg.h +++ b/ace/Log_Msg.h @@ -389,8 +389,8 @@ private: friend void ACE_OS::cleanup_tss (const u_int); // = Disallow these operations. - ACE_UNIMPLEMENTED_FUNC (ACE_Log_Msg &operator= (const ACE_Log_Msg &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Log_Msg (const ACE_Log_Msg &)) + ACE_Log_Msg &operator= (const ACE_Log_Msg &); + ACE_Log_Msg (const ACE_Log_Msg &); }; // #if defined (__ACE_INLINE__) diff --git a/ace/Managed_Object.h b/ace/Managed_Object.h index 523fcf1c6fd..826188dc0ba 100644 --- a/ace/Managed_Object.h +++ b/ace/Managed_Object.h @@ -133,10 +133,9 @@ public: private: // Disallow instantiation of this class. - ACE_UNIMPLEMENTED_FUNC (ACE_Managed_Object ()) - ACE_UNIMPLEMENTED_FUNC (ACE_Managed_Object (const ACE_Managed_Object<TYPE> &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Managed_Object<TYPE> &operator= - (const ACE_Managed_Object<TYPE> &)) + ACE_UNIMPLEMENTED_FUNC (ACE_Managed_Object ()); + ACE_UNIMPLEMENTED_FUNC (ACE_Managed_Object (const ACE_Managed_Object<TYPE> &)); + ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Managed_Object<TYPE> &)); friend class this_prevents_compiler_warning_about_only_private_constructors; }; diff --git a/ace/Map_Manager.h b/ace/Map_Manager.h index bc626ce17b5..a1b59ee3816 100644 --- a/ace/Map_Manager.h +++ b/ace/Map_Manager.h @@ -246,8 +246,8 @@ private: // Index of highest active elementin this->search_structure_. // = Disallow these operations. - ACE_UNIMPLEMENTED_FUNC (ACE_Map_Manager &operator= (const ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK> &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Map_Manager (const ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK> &)) + ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK> &)); + ACE_UNIMPLEMENTED_FUNC (ACE_Map_Manager (const ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK> &)); }; template <class EXT_ID, class INT_ID, class ACE_LOCK> diff --git a/ace/Mem_Map.h b/ace/Mem_Map.h index 2fc568fbd20..c60790f8fdb 100644 --- a/ace/Mem_Map.h +++ b/ace/Mem_Map.h @@ -183,8 +183,8 @@ private: // the file into memory. // = Disallow copying and assignment. - ACE_UNIMPLEMENTED_FUNC (ACE_Mem_Map (const ACE_Mem_Map &)) - ACE_UNIMPLEMENTED_FUNC (void operator = (const ACE_Mem_Map &)) + ACE_Mem_Map (const ACE_Mem_Map &); + void operator = (const ACE_Mem_Map &); }; #if defined (__ACE_INLINE__) diff --git a/ace/Message_Block.h b/ace/Message_Block.h index 5512cfb5616..590925d76e2 100644 --- a/ace/Message_Block.h +++ b/ace/Message_Block.h @@ -354,8 +354,8 @@ private: // actual memory buffer. // = Disallow these operations for now (use <clone> instead). - ACE_UNIMPLEMENTED_FUNC (ACE_Message_Block &operator= (const ACE_Message_Block &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Message_Block (const ACE_Message_Block &)) + ACE_Message_Block &operator= (const ACE_Message_Block &); + ACE_Message_Block (const ACE_Message_Block &); }; class ACE_Export ACE_Data_Block @@ -484,8 +484,8 @@ private: // <ACE_Message_Block>s. // = Disallow these operations. - ACE_UNIMPLEMENTED_FUNC (ACE_Data_Block &operator= (const ACE_Data_Block &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Data_Block (const ACE_Data_Block &)) + ACE_Data_Block &operator= (const ACE_Data_Block &); + ACE_Data_Block (const ACE_Data_Block &); }; #if defined (__ACE_INLINE__) diff --git a/ace/Message_Queue.h b/ace/Message_Queue.h index 4500bdf7103..0b29b661ca2 100644 --- a/ace/Message_Queue.h +++ b/ace/Message_Queue.h @@ -278,8 +278,8 @@ protected: private: // = Disallow these operations. - ACE_UNIMPLEMENTED_FUNC (ACE_Message_Queue &operator= (const ACE_Message_Queue<ACE_SYNCH_USE> &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Message_Queue (const ACE_Message_Queue<ACE_SYNCH_USE> &)) + ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Message_Queue<ACE_SYNCH_USE> &)); + ACE_UNIMPLEMENTED_FUNC (ACE_Message_Queue (const ACE_Message_Queue<ACE_SYNCH_USE> &)); }; template <ACE_SYNCH_DECL> @@ -401,18 +401,18 @@ private: #endif #if defined (ACE_REQUIRES_FUNC_DEFINITIONS) - // Provide a null definition for the function. Not pleasant. -# define ACE_UNIMPLEMENTED_FUNC(f) f {} +// It just evaporated ;-) Not pleasant. +# define ACE_UNIMPLEMENTED_FUNC(f) #else -# define ACE_UNIMPLEMENTED_FUNC(f) f; +# define ACE_UNIMPLEMENTED_FUNC(f) f #endif /* ACE_REQUIRES_FUNC_DEFINITIONS */ // Easy way to designate that a class is used as a pseudo-namespace. // Insures that g++ "friendship" anamolies are properly handled. #define ACE_CLASS_IS_NAMESPACE(CLASSNAME) \ private: \ -ACE_UNIMPLEMENTED_FUNC (CLASSNAME (void)) \ -ACE_UNIMPLEMENTED_FUNC (CLASSNAME (const CLASSNAME&)) \ +CLASSNAME (void); \ +CLASSNAME (const CLASSNAME&); \ friend class ace_dewarn_gplusplus // These hooks enable ACE to have all dynamic memory management diff --git a/ace/Object_Manager.h b/ace/Object_Manager.h index 7050e46ecc4..fad9669bb14 100644 --- a/ace/Object_Manager.h +++ b/ace/Object_Manager.h @@ -348,8 +348,8 @@ private: #endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER */ // Disallow copying by not implementing the following . . . - ACE_UNIMPLEMENTED_FUNC (ACE_Object_Manager (const ACE_Object_Manager &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Object_Manager &operator= (const ACE_Object_Manager &)) + ACE_Object_Manager (const ACE_Object_Manager &); + ACE_Object_Manager &operator= (const ACE_Object_Manager &); }; #if defined (ACE_HAS_THREADS) diff --git a/ace/Priority_Reactor.h b/ace/Priority_Reactor.h index dff15421f3c..7285a0ded59 100644 --- a/ace/Priority_Reactor.h +++ b/ace/Priority_Reactor.h @@ -78,8 +78,8 @@ private: // The queues themselves use this allocator to minimize dynamic // memory usage. - ACE_UNIMPLEMENTED_FUNC (ACE_Priority_Reactor (const ACE_Select_Reactor &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Priority_Reactor &operator = (const ACE_Select_Reactor &)) + ACE_Priority_Reactor (const ACE_Select_Reactor &); + ACE_Priority_Reactor &operator = (const ACE_Select_Reactor &); // Deny access since member-wise won't work... }; diff --git a/ace/Reactor.h b/ace/Reactor.h index 4b8a53edfd8..baf1cce568d 100644 --- a/ace/Reactor.h +++ b/ace/Reactor.h @@ -440,8 +440,8 @@ protected: static sig_atomic_t end_event_loop_; // Terminate the event loop. - ACE_UNIMPLEMENTED_FUNC (ACE_Reactor (const ACE_Reactor &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Reactor &operator = (const ACE_Reactor &)) + ACE_Reactor (const ACE_Reactor &); + ACE_Reactor &operator = (const ACE_Reactor &); // Deny access since member-wise won't work... }; diff --git a/ace/Read_Buffer.h b/ace/Read_Buffer.h index 36b2f1b0778..49f3acc99e0 100644 --- a/ace/Read_Buffer.h +++ b/ace/Read_Buffer.h @@ -84,9 +84,9 @@ private: // Pointer to the allocator. // = Disallow copying and assignment... - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Read_Buffer &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Read_Buffer (const ACE_Read_Buffer &)) -}; + void operator= (const ACE_Read_Buffer &); + ACE_Read_Buffer (const ACE_Read_Buffer &); +}; #include "ace/Read_Buffer.i" diff --git a/ace/Registry.h b/ace/Registry.h index 121d0f557f5..917759fed1a 100644 --- a/ace/Registry.h +++ b/ace/Registry.h @@ -402,10 +402,10 @@ public: // (String version) private: - ACE_UNIMPLEMENTED_FUNC (Naming_Context (const Naming_Context &rhs)) + Naming_Context (const Naming_Context &rhs); // Disallow copy constructors - ACE_UNIMPLEMENTED_FUNC (const Naming_Context &operator= (const Naming_Context &rhs)) + const Naming_Context &operator= (const Naming_Context &rhs); // Disallow assignment HKEY key_; diff --git a/ace/Remote_Tokens.h b/ace/Remote_Tokens.h index a8099e26f75..6630219ece1 100644 --- a/ace/Remote_Tokens.h +++ b/ace/Remote_Tokens.h @@ -275,8 +275,8 @@ protected: // Token_Proxy. private: - ACE_UNIMPLEMENTED_FUNC (ACE_TSS_Connection (const ACE_TSS_Connection &)) - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_TSS_Connection &)) + ACE_TSS_Connection (const ACE_TSS_Connection &); + void operator= (const ACE_TSS_Connection &); // Private: should not be used }; diff --git a/ace/Select_Reactor.h b/ace/Select_Reactor.h index acac956cea6..9676dc797ed 100644 --- a/ace/Select_Reactor.h +++ b/ace/Select_Reactor.h @@ -865,8 +865,8 @@ private: int handle_events_i (ACE_Time_Value *max_wait_time = 0); // Stops the VC++ compiler from bitching about exceptions and destructors - ACE_UNIMPLEMENTED_FUNC (ACE_Select_Reactor (const ACE_Select_Reactor &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Select_Reactor &operator = (const ACE_Select_Reactor &)) + ACE_Select_Reactor (const ACE_Select_Reactor &); + ACE_Select_Reactor &operator = (const ACE_Select_Reactor &); // Deny access since member-wise won't work... }; diff --git a/ace/Synch.h b/ace/Synch.h index 1d6c8144b09..2e9dbf490ab 100644 --- a/ace/Synch.h +++ b/ace/Synch.h @@ -171,8 +171,8 @@ protected: private: // = Prevent assignment and initialization. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_File_Lock &)) - ACE_UNIMPLEMENTED_FUNC (ACE_File_Lock (const ACE_File_Lock &)) + void operator= (const ACE_File_Lock &); + ACE_File_Lock (const ACE_File_Lock &); }; class ACE_Export ACE_Semaphore @@ -257,8 +257,8 @@ protected: private: // = Prevent assignment and initialization. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Semaphore &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Semaphore (const ACE_Semaphore &)) + void operator= (const ACE_Semaphore &); + ACE_Semaphore (const ACE_Semaphore &); }; class ACE_Export ACE_Process_Semaphore @@ -402,8 +402,8 @@ protected: private: // = Prevent assignment and initialization. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_RW_Mutex &)) - ACE_UNIMPLEMENTED_FUNC (ACE_RW_Mutex (const ACE_RW_Mutex &)) + void operator= (const ACE_RW_Mutex &); + ACE_RW_Mutex (const ACE_RW_Mutex &); }; class ACE_Export ACE_Mutex @@ -473,8 +473,8 @@ public: private: // = Prevent assignment and initialization. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Mutex &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Mutex (const ACE_Mutex &)) + void operator= (const ACE_Mutex &); + ACE_Mutex (const ACE_Mutex &); }; class ACE_Export ACE_Process_Mutex @@ -617,8 +617,8 @@ public: private: // = Prevent assignment and initialization. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Null_Barrier &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Null_Barrier (const ACE_Null_Barrier &)) + void operator= (const ACE_Null_Barrier &); + ACE_Null_Barrier (const ACE_Null_Barrier &); }; class ACE_Export ACE_Null_Mutex @@ -673,8 +673,8 @@ protected: private: // = Prevent assignment and initialization. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Null_Condition &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Null_Condition (const ACE_Null_Condition &)) + void operator= (const ACE_Null_Condition &); + ACE_Null_Condition (const ACE_Null_Condition &); }; class ACE_Export ACE_Null_Mutex_Guard @@ -699,8 +699,8 @@ public: private: // = Prevent assignment and initialization. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Null_Mutex_Guard &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Null_Mutex_Guard (const ACE_Null_Mutex_Guard &)) + void operator= (const ACE_Null_Mutex_Guard &); + ACE_Null_Mutex_Guard (const ACE_Null_Mutex_Guard &); }; class ACE_TSS_Adapter @@ -810,8 +810,8 @@ protected: private: // = Prevent copying. - ACE_UNIMPLEMENTED_FUNC (ACE_Event (const ACE_Event& event)) - ACE_UNIMPLEMENTED_FUNC (const ACE_Event &operator= (const ACE_Event &rhs)) + ACE_Event (const ACE_Event& event); + const ACE_Event &operator= (const ACE_Event &rhs); }; class ACE_Export ACE_Manual_Event : public ACE_Event @@ -939,8 +939,8 @@ public: private: // = Prevent assignment and initialization. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Thread_Mutex &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Thread_Mutex (const ACE_Thread_Mutex &)) + void operator= (const ACE_Thread_Mutex &); + ACE_Thread_Mutex (const ACE_Thread_Mutex &); }; class ACE_Export ACE_Thread_Mutex_Guard @@ -993,8 +993,8 @@ protected: private: // = Prevent assignment and initialization. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Thread_Mutex_Guard &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Thread_Mutex_Guard (const ACE_Thread_Mutex_Guard &)) + void operator= (const ACE_Thread_Mutex_Guard &); + ACE_Thread_Mutex_Guard (const ACE_Thread_Mutex_Guard &); }; class ACE_Export ACE_Condition_Thread_Mutex @@ -1071,8 +1071,8 @@ protected: private: // = Prevent assignment and initialization. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Condition_Thread_Mutex &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Condition_Thread_Mutex (const ACE_Condition_Thread_Mutex &)) + void operator= (const ACE_Condition_Thread_Mutex &); + ACE_Condition_Thread_Mutex (const ACE_Condition_Thread_Mutex &); }; class ACE_Export ACE_Recursive_Thread_Mutex @@ -1175,8 +1175,8 @@ protected: private: // = Prevent assignment and initialization. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Recursive_Thread_Mutex &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Recursive_Thread_Mutex (const ACE_Recursive_Thread_Mutex &)) + void operator= (const ACE_Recursive_Thread_Mutex &); + ACE_Recursive_Thread_Mutex (const ACE_Recursive_Thread_Mutex &); }; class ACE_Export ACE_RW_Thread_Mutex : public ACE_RW_Mutex @@ -1288,8 +1288,8 @@ protected: private: // = Prevent assignment and initialization. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Barrier &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Barrier (const ACE_Barrier &)) + void operator= (const ACE_Barrier &); + ACE_Barrier (const ACE_Barrier &); }; #if 0 diff --git a/ace/Synch_T.h b/ace/Synch_T.h index ca5172afc2b..7ad603f2f41 100644 --- a/ace/Synch_T.h +++ b/ace/Synch_T.h @@ -299,8 +299,8 @@ protected: // "Destructor" that deletes internal TYPE * when thread exits. #endif /* defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)) */ // = Disallow copying... - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_TSS<TYPE> &)) - ACE_UNIMPLEMENTED_FUNC (ACE_TSS (const ACE_TSS<TYPE> &)) + ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_TSS<TYPE> &)); + ACE_UNIMPLEMENTED_FUNC (ACE_TSS (const ACE_TSS<TYPE> &)); }; template <class ACE_LOCK> @@ -378,8 +378,8 @@ protected: private: // = Prevent assignment and initialization. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Guard<ACE_LOCK> &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Guard (const ACE_Guard<ACE_LOCK> &)) + ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Guard<ACE_LOCK> &)); + ACE_UNIMPLEMENTED_FUNC (ACE_Guard (const ACE_Guard<ACE_LOCK> &)); }; template <class ACE_LOCK> @@ -533,8 +533,8 @@ protected: private: // = Prevent assignment and initialization. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_TSS_Guard<ACE_LOCK> &)) - ACE_UNIMPLEMENTED_FUNC (ACE_TSS_Guard (const ACE_TSS_Guard<ACE_LOCK> &)) + ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_TSS_Guard<ACE_LOCK> &)); + ACE_UNIMPLEMENTED_FUNC (ACE_TSS_Guard (const ACE_TSS_Guard<ACE_LOCK> &)); }; template <class ACE_LOCK> @@ -687,8 +687,8 @@ protected: private: // = Prevent assignment and initialization. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Condition<MUTEX> &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Condition (const ACE_Condition<MUTEX> &)) + ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Condition<MUTEX> &)); + ACE_UNIMPLEMENTED_FUNC (ACE_Condition (const ACE_Condition<MUTEX> &)); }; template <class MUTEX> diff --git a/ace/Task.h b/ace/Task.h index 9253c0f5da0..499cdf757bf 100644 --- a/ace/Task.h +++ b/ace/Task.h @@ -195,8 +195,8 @@ public: private: // = Disallow these operations. - ACE_UNIMPLEMENTED_FUNC (ACE_Task_Base &operator= (const ACE_Task_Base &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Task_Base (const ACE_Task_Base &)) + ACE_Task_Base &operator= (const ACE_Task_Base &); + ACE_Task_Base (const ACE_Task_Base &); }; #if defined (__ACE_INLINE__) diff --git a/ace/Task_T.h b/ace/Task_T.h index 110a5ee24cd..3001de0c247 100644 --- a/ace/Task_T.h +++ b/ace/Task_T.h @@ -124,8 +124,8 @@ public: // Should be protected: private: // = Disallow these operations. - ACE_UNIMPLEMENTED_FUNC (ACE_Task &operator= (const ACE_Task<ACE_SYNCH_USE> &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Task (const ACE_Task<ACE_SYNCH_USE> &)) + ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Task<ACE_SYNCH_USE> &)); + ACE_UNIMPLEMENTED_FUNC (ACE_Task (const ACE_Task<ACE_SYNCH_USE> &)); }; #if defined (__ACE_INLINE__) diff --git a/ace/Timer_Hash_T.h b/ace/Timer_Hash_T.h index 8bebc77f86c..178a4130391 100644 --- a/ace/Timer_Hash_T.h +++ b/ace/Timer_Hash_T.h @@ -68,8 +68,8 @@ private: // Timer Queue to do the calling up to // = Don't allow these operations for now. - ACE_UNIMPLEMENTED_FUNC (ACE_Timer_Hash_Upcall (const ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK> &)) - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK> &)) + ACE_UNIMPLEMENTED_FUNC (ACE_Timer_Hash_Upcall (const ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK> &)); + ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK> &)); }; template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET> @@ -226,8 +226,8 @@ private: // Iterator used to expire timers. // = Don't allow these operations for now. - ACE_UNIMPLEMENTED_FUNC (ACE_Timer_Hash_T (const ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET> &)) - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET> &)) + ACE_UNIMPLEMENTED_FUNC (ACE_Timer_Hash_T (const ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET> &)); + ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET> &)); }; #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) && !defined(ACE_HAS_BROKEN_HPUX_TEMPLATES) diff --git a/ace/Timer_Heap_T.h b/ace/Timer_Heap_T.h index 6fac478a7c5..3c3a01e9cd4 100644 --- a/ace/Timer_Heap_T.h +++ b/ace/Timer_Heap_T.h @@ -251,8 +251,8 @@ private: // Used to delete the allocated memory when required. // = Don't allow these operations for now. - ACE_UNIMPLEMENTED_FUNC (ACE_Timer_Heap_T (const ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK> &)) - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK> &)) + ACE_UNIMPLEMENTED_FUNC (ACE_Timer_Heap_T (const ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK> &)); + ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK> &)); }; #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) && !defined(ACE_HAS_BROKEN_HPUX_TEMPLATES) diff --git a/ace/Timer_List_T.h b/ace/Timer_List_T.h index eaec91b52e3..bc10b67644c 100644 --- a/ace/Timer_List_T.h +++ b/ace/Timer_List_T.h @@ -173,8 +173,8 @@ private: // method. // = Don't allow these operations for now. - ACE_UNIMPLEMENTED_FUNC (ACE_Timer_List_T (const ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK> &)) - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK> &)) + ACE_UNIMPLEMENTED_FUNC (ACE_Timer_List_T (const ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK> &)); + ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK> &)); }; #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) && !defined(ACE_HAS_BROKEN_HPUX_TEMPLATES) diff --git a/ace/Timer_Queue_T.h b/ace/Timer_Queue_T.h index b4079123eae..6d2ddfc4085 100644 --- a/ace/Timer_Queue_T.h +++ b/ace/Timer_Queue_T.h @@ -313,8 +313,8 @@ private: // Adjusts for timer skew in various clocks. // = Don't allow these operations for now. - ACE_UNIMPLEMENTED_FUNC (ACE_Timer_Queue_T (const ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK> &)) - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK> &)) + ACE_UNIMPLEMENTED_FUNC (ACE_Timer_Queue_T (const ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK> &)); + ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK> &)); }; template <class ACE_LOCK> diff --git a/ace/Timer_Wheel_T.h b/ace/Timer_Wheel_T.h index 4407a341ee3..d278b1e2cdc 100644 --- a/ace/Timer_Wheel_T.h +++ b/ace/Timer_Wheel_T.h @@ -195,8 +195,8 @@ private: // Pointer to the freelist of <ACE_Timer_Node_T<TYPE>>. // = Don't allow these operations for now. - ACE_UNIMPLEMENTED_FUNC (ACE_Timer_Wheel_T (const ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK> &)) - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK> &)) + ACE_UNIMPLEMENTED_FUNC (ACE_Timer_Wheel_T (const ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK> &)); + ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK> &)); }; #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) && !defined (ACE_HAS_BROKEN_HPUX_TEMPLATES) diff --git a/ace/WFMO_Reactor.h b/ace/WFMO_Reactor.h index 8f1f103e71b..055011abff0 100644 --- a/ace/WFMO_Reactor.h +++ b/ace/WFMO_Reactor.h @@ -958,8 +958,8 @@ protected: // This flag is used to keep track of whether we are already closed. private: - ACE_UNIMPLEMENTED_FUNC (ACE_WFMO_Reactor (const ACE_WFMO_Reactor &)) - ACE_UNIMPLEMENTED_FUNC (ACE_WFMO_Reactor &operator = (const ACE_WFMO_Reactor &)) + ACE_WFMO_Reactor (const ACE_WFMO_Reactor &); + ACE_WFMO_Reactor &operator = (const ACE_WFMO_Reactor &); // Deny access since member-wise won't work... }; diff --git a/ace/XtReactor.h b/ace/XtReactor.h index 7d6f3d5187e..1d9924870c5 100644 --- a/ace/XtReactor.h +++ b/ace/XtReactor.h @@ -96,8 +96,8 @@ private: static void TimerCallbackProc (XtPointer closure, XtIntervalId *id); static void InputCallbackProc (XtPointer closure, int* source, XtInputId *id); - ACE_UNIMPLEMENTED_FUNC (ACE_XtReactor (const ACE_XtReactor &)) - ACE_UNIMPLEMENTED_FUNC (ACE_XtReactor &operator = (const ACE_XtReactor &)) + ACE_XtReactor (const ACE_XtReactor &); + ACE_XtReactor &operator = (const ACE_XtReactor &); // Deny access since member-wise won't work... }; #endif /* ACE_HAS_XT */ |