From 7bb61a6381e22396fbbd525bc0373c546e3d9b71 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 5 Jan 2021 13:12:24 +0100 Subject: Use delete instead of ACE_UNIMPLEMENTED_FUNC * ACE/ace/Active_Map_Manager_T.h: * ACE/ace/Arg_Shifter.h: * ACE/ace/Asynch_IO.h: * ACE/ace/Auto_IncDec_T.h: * ACE/ace/Based_Pointer_Repository.h: * ACE/ace/Cache_Map_Manager_T.h: * ACE/ace/Compression/Compressor.h: * ACE/ace/Condition_T.h: * ACE/ace/Dynamic_Service.h: * ACE/ace/Free_List.h: * ACE/ace/Guard_T.h: * ACE/ace/Hash_Map_Manager_T.h: * ACE/ace/Hash_Multi_Map_Manager_T.h: * ACE/ace/IOStream_T.h: * ACE/ace/Managed_Object.h: * ACE/ace/Map_Manager.h: * ACE/ace/Map_T.h: * ACE/ace/Message_Block_T.h: * ACE/ace/Message_Queue_T.h: * ACE/ace/OS_Log_Msg_Attributes.h: * ACE/ace/Parse_Node.cpp: * ACE/ace/Parse_Node.h: * ACE/ace/SSL/SSL_SOCK_Stream.h: * ACE/ace/Select_Reactor_T.h: * ACE/ace/Singleton.h: * ACE/ace/Task_T.h: * ACE/ace/Timer_Hash_T.h: * ACE/ace/Timer_List_T.h: --- ACE/ace/Active_Map_Manager_T.h | 4 +-- ACE/ace/Arg_Shifter.h | 4 +-- ACE/ace/Asynch_IO.h | 40 ++++++++++++------------- ACE/ace/Auto_IncDec_T.h | 4 +-- ACE/ace/Based_Pointer_Repository.h | 4 +-- ACE/ace/Cache_Map_Manager_T.h | 4 +-- ACE/ace/Compression/Compressor.h | 4 +-- ACE/ace/Condition_T.h | 4 +-- ACE/ace/Dynamic_Service.h | 6 ++-- ACE/ace/Free_List.h | 4 +-- ACE/ace/Guard_T.h | 8 ++--- ACE/ace/Hash_Map_Manager_T.h | 4 +-- ACE/ace/Hash_Multi_Map_Manager_T.h | 4 +-- ACE/ace/IOStream_T.h | 8 ++--- ACE/ace/Managed_Object.h | 10 +++---- ACE/ace/Map_Manager.h | 4 +-- ACE/ace/Map_T.h | 25 +++++++--------- ACE/ace/Message_Block_T.h | 4 +-- ACE/ace/Message_Queue_T.h | 10 +++---- ACE/ace/OS_Log_Msg_Attributes.h | 4 +-- ACE/ace/Parse_Node.cpp | 2 +- ACE/ace/Parse_Node.h | 61 ++++++++++++++++++-------------------- ACE/ace/SSL/SSL_SOCK_Stream.h | 4 +-- ACE/ace/Select_Reactor_T.h | 4 +-- ACE/ace/Singleton.h | 4 +-- ACE/ace/Task_T.h | 5 ++-- ACE/ace/Timer_Hash_T.h | 4 +-- ACE/ace/Timer_List_T.h | 4 +-- 28 files changed, 118 insertions(+), 129 deletions(-) diff --git a/ACE/ace/Active_Map_Manager_T.h b/ACE/ace/Active_Map_Manager_T.h index ee4e7783e8d..8bfb7afcc5c 100644 --- a/ACE/ace/Active_Map_Manager_T.h +++ b/ACE/ace/Active_Map_Manager_T.h @@ -184,8 +184,8 @@ protected: private: // = Disallow these operations. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Active_Map_Manager &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Active_Map_Manager (const ACE_Active_Map_Manager &)) + void operator= (const ACE_Active_Map_Manager &) = delete; + ACE_Active_Map_Manager (const ACE_Active_Map_Manager &) = delete; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Arg_Shifter.h b/ACE/ace/Arg_Shifter.h index ec1817e692f..547d772e12d 100644 --- a/ACE/ace/Arg_Shifter.h +++ b/ACE/ace/Arg_Shifter.h @@ -187,10 +187,10 @@ public: private: /// Copy Constructor should not be used. - ACE_UNIMPLEMENTED_FUNC (ACE_Arg_Shifter_T (const ACE_Arg_Shifter_T &)) + ACE_Arg_Shifter_T (const ACE_Arg_Shifter_T &) = delete; /// Assignment '=' operator should not be used. - ACE_UNIMPLEMENTED_FUNC (ACE_Arg_Shifter_T operator= (const ACE_Arg_Shifter_T &)) + ACE_Arg_Shifter_T operator= (const ACE_Arg_Shifter_T &) = delete; /// Refactor the constructor logic. void init (); diff --git a/ACE/ace/Asynch_IO.h b/ACE/ace/Asynch_IO.h index 78db98fcdd0..a0899b7b596 100644 --- a/ACE/ace/Asynch_IO.h +++ b/ACE/ace/Asynch_IO.h @@ -406,8 +406,8 @@ public: ACE_Asynch_Read_Stream_Result_Impl *implementation_; }; private: - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Asynch_Read_Stream &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Asynch_Read_Stream (const ACE_Asynch_Read_Stream &)) + void operator= (const ACE_Asynch_Read_Stream &) = delete; + ACE_Asynch_Read_Stream (const ACE_Asynch_Read_Stream &) = delete; }; // Forward declarations @@ -560,8 +560,8 @@ public: ACE_Asynch_Write_Stream_Result_Impl *implementation_; }; private: - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Asynch_Write_Stream &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Asynch_Write_Stream (const ACE_Asynch_Write_Stream &)) + void operator= (const ACE_Asynch_Write_Stream &) = delete; + ACE_Asynch_Write_Stream (const ACE_Asynch_Write_Stream &) = delete; }; // Forward declarations @@ -709,8 +709,8 @@ public: void operator= (Result &) {} }; private: - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Asynch_Read_File &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Asynch_Read_File (const ACE_Asynch_Read_File &)) + void operator= (const ACE_Asynch_Read_File &) = delete; + ACE_Asynch_Read_File (const ACE_Asynch_Read_File &) = delete; }; // Forward declarations @@ -843,8 +843,8 @@ public: void operator= (Result &) {}; }; private: - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Asynch_Write_File &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Asynch_Write_File (const ACE_Asynch_Write_File &)) + void operator= (const ACE_Asynch_Write_File &) = delete; + ACE_Asynch_Write_File (const ACE_Asynch_Write_File &) = delete; }; // Forward declarations @@ -981,8 +981,8 @@ public: ACE_Asynch_Accept_Result_Impl *implementation_; }; private: - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Asynch_Accept &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Asynch_Accept (const ACE_Asynch_Accept &)) + void operator= (const ACE_Asynch_Accept &) = delete; + ACE_Asynch_Accept (const ACE_Asynch_Accept &) = delete; }; // Forward declarations class ACE_Asynch_Connect_Result_Impl; @@ -1076,8 +1076,8 @@ public: ACE_Asynch_Connect_Result_Impl *implementation_; }; private: - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Asynch_Connect &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Asynch_Connect (const ACE_Asynch_Connect &)) + void operator= (const ACE_Asynch_Connect &) = delete; + ACE_Asynch_Connect (const ACE_Asynch_Connect &) = delete; }; // Forward declarations @@ -1287,8 +1287,8 @@ public: ACE_TRANSMIT_FILE_BUFFERS transmit_buffers_; }; private: - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Asynch_Transmit_File &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Asynch_Transmit_File (const ACE_Asynch_Transmit_File &)) + void operator= (const ACE_Asynch_Transmit_File &) = delete; + ACE_Asynch_Transmit_File (const ACE_Asynch_Transmit_File &) = delete; }; @@ -1422,8 +1422,8 @@ public: ACE_Asynch_Read_Dgram_Result_Impl *implementation_; }; private: - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Asynch_Read_Dgram &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Asynch_Read_Dgram (const ACE_Asynch_Read_Dgram &)) + void operator= (const ACE_Asynch_Read_Dgram &) = delete; + ACE_Asynch_Read_Dgram (const ACE_Asynch_Read_Dgram &) = delete; }; // Forward declarations @@ -1552,8 +1552,8 @@ public: ACE_Asynch_Write_Dgram_Result_Impl *implementation_; }; private: - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Asynch_Write_Dgram &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Asynch_Write_Dgram (const ACE_Asynch_Write_Dgram &)) + void operator= (const ACE_Asynch_Write_Dgram &) = delete; + ACE_Asynch_Write_Dgram (const ACE_Asynch_Write_Dgram &) = delete; }; @@ -1673,8 +1673,8 @@ protected: ACE_Refcounted_Auto_Ptr proxy_; private: - ACE_UNIMPLEMENTED_FUNC (ACE_Handler (const ACE_Handler &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Handler operator= (const ACE_Handler &)) + ACE_Handler (const ACE_Handler &) = delete; + ACE_Handler operator= (const ACE_Handler &) = delete; }; // Forward declarations diff --git a/ACE/ace/Auto_IncDec_T.h b/ACE/ace/Auto_IncDec_T.h index 6dcb530eb6d..72d98af0f47 100644 --- a/ACE/ace/Auto_IncDec_T.h +++ b/ACE/ace/Auto_IncDec_T.h @@ -56,8 +56,8 @@ protected: /// we're incrementing/decrementing. ACE_SAFELY_INCREMENTABLE_DECREMENTABLE &counter_; private: - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Auto_IncDec &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Auto_IncDec (const ACE_Auto_IncDec &)) + void operator= (const ACE_Auto_IncDec &) = delete; + ACE_Auto_IncDec (const ACE_Auto_IncDec &) = delete; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Based_Pointer_Repository.h b/ACE/ace/Based_Pointer_Repository.h index 8139a8edbfb..ba0fa32fcf0 100644 --- a/ACE/ace/Based_Pointer_Repository.h +++ b/ACE/ace/Based_Pointer_Repository.h @@ -68,8 +68,8 @@ private: ACE_Based_Pointer_Repository_Rep *rep_; private: - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Based_Pointer_Repository &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Based_Pointer_Repository (const ACE_Based_Pointer_Repository &)) + void operator= (const ACE_Based_Pointer_Repository &) = delete; + ACE_Based_Pointer_Repository (const ACE_Based_Pointer_Repository &) = delete; }; // ---------------------------------- diff --git a/ACE/ace/Cache_Map_Manager_T.h b/ACE/ace/Cache_Map_Manager_T.h index ee88bd4bdc5..38bee2de970 100644 --- a/ACE/ace/Cache_Map_Manager_T.h +++ b/ACE/ace/Cache_Map_Manager_T.h @@ -227,8 +227,8 @@ protected: private: // = Disallow these operations. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Cache_Map_Manager &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Cache_Map_Manager (const ACE_Cache_Map_Manager &)) + void operator= (const ACE_Cache_Map_Manager &) = delete; + ACE_Cache_Map_Manager (const ACE_Cache_Map_Manager &) = delete; }; /** diff --git a/ACE/ace/Compression/Compressor.h b/ACE/ace/Compression/Compressor.h index bb20e01c32b..b20deb877bf 100644 --- a/ACE/ace/Compression/Compressor.h +++ b/ACE/ace/Compression/Compressor.h @@ -122,8 +122,8 @@ private: ACE_UINT64 compressed_bytes_; ACE_UINT64 uncompressed_bytes_; - ACE_UNIMPLEMENTED_FUNC (ACE_Compressor (const ACE_Compressor&)) - ACE_UNIMPLEMENTED_FUNC (ACE_Compressor& operator= (const ACE_Compressor&)) + ACE_Compressor (const ACE_Compressor&) = delete; + ACE_Compressor& operator= (const ACE_Compressor&) = delete; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Condition_T.h b/ACE/ace/Condition_T.h index 0f709e4814e..0a79a413f9e 100644 --- a/ACE/ace/Condition_T.h +++ b/ACE/ace/Condition_T.h @@ -115,8 +115,8 @@ protected: private: // = Prevent assignment and initialization. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Condition &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Condition (const ACE_Condition &)) + void operator= (const ACE_Condition &) = delete; + ACE_Condition (const ACE_Condition &) = delete; }; /** diff --git a/ACE/ace/Dynamic_Service.h b/ACE/ace/Dynamic_Service.h index 84b45b0bd42..713a5aac98f 100644 --- a/ACE/ace/Dynamic_Service.h +++ b/ACE/ace/Dynamic_Service.h @@ -63,9 +63,9 @@ public: #endif // ACE_USES_WCHAR private: - ACE_UNIMPLEMENTED_FUNC (ACE_Dynamic_Service ()) - ACE_UNIMPLEMENTED_FUNC (ACE_Dynamic_Service (const ACE_Dynamic_Service&)) - ACE_UNIMPLEMENTED_FUNC (ACE_Dynamic_Service& operator= (const ACE_Dynamic_Service&)) + ACE_Dynamic_Service () = delete; + ACE_Dynamic_Service (const ACE_Dynamic_Service&) = delete; + ACE_Dynamic_Service& operator= (const ACE_Dynamic_Service&) = delete; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Free_List.h b/ACE/ace/Free_List.h index 7f661d41db2..98426844567 100644 --- a/ACE/ace/Free_List.h +++ b/ACE/ace/Free_List.h @@ -131,8 +131,8 @@ protected: private: // = Don't allow these operations for now. - ACE_UNIMPLEMENTED_FUNC (ACE_Locked_Free_List (const ACE_Locked_Free_List &)) - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Locked_Free_List &)) + ACE_Locked_Free_List (const ACE_Locked_Free_List &) = delete; + void operator= (const ACE_Locked_Free_List &) = delete; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Guard_T.h b/ACE/ace/Guard_T.h index b90de0bced4..e85ff7f5dfa 100644 --- a/ACE/ace/Guard_T.h +++ b/ACE/ace/Guard_T.h @@ -124,8 +124,8 @@ protected: private: // = Prevent assignment and initialization. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Guard &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Guard (const ACE_Guard &)) + void operator= (const ACE_Guard &) = delete; + ACE_Guard (const ACE_Guard &) = delete; }; /** @@ -284,8 +284,8 @@ private: typedef ACE_Guard Guard_Type; // FUZZ: enable check_for_ACE_Guard - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_TSS_Guard &)) - ACE_UNIMPLEMENTED_FUNC (ACE_TSS_Guard (const ACE_TSS_Guard &)) + void operator= (const ACE_TSS_Guard &) = delete; + ACE_TSS_Guard (const ACE_TSS_Guard &) = delete; }; /** diff --git a/ACE/ace/Hash_Map_Manager_T.h b/ACE/ace/Hash_Map_Manager_T.h index 755283eb302..70f20f9e9ed 100644 --- a/ACE/ace/Hash_Map_Manager_T.h +++ b/ACE/ace/Hash_Map_Manager_T.h @@ -574,8 +574,8 @@ private: size_t cur_size_; // = Disallow these operations. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Hash_Map_Manager_Ex &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Hash_Map_Manager_Ex (const ACE_Hash_Map_Manager_Ex &)) + void operator= (const ACE_Hash_Map_Manager_Ex &) = delete; + ACE_Hash_Map_Manager_Ex (const ACE_Hash_Map_Manager_Ex &) = delete; }; /** diff --git a/ACE/ace/Hash_Multi_Map_Manager_T.h b/ACE/ace/Hash_Multi_Map_Manager_T.h index 1cacc63ba39..29cce896653 100644 --- a/ACE/ace/Hash_Multi_Map_Manager_T.h +++ b/ACE/ace/Hash_Multi_Map_Manager_T.h @@ -594,8 +594,8 @@ private: size_t cur_size_; // = Disallow these operations. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Hash_Multi_Map_Manager &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Hash_Multi_Map_Manager (const ACE_Hash_Multi_Map_Manager &)) + void operator= (const ACE_Hash_Multi_Map_Manager &) = delete; + ACE_Hash_Multi_Map_Manager (const ACE_Hash_Multi_Map_Manager &) = delete; }; /** diff --git a/ACE/ace/IOStream_T.h b/ACE/ace/IOStream_T.h index 8a8776a79eb..ed389dce9a6 100644 --- a/ACE/ace/IOStream_T.h +++ b/ACE/ace/IOStream_T.h @@ -229,10 +229,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 (...)) + ssize_t send (...) = delete; + ssize_t recv (...) = delete; + ssize_t send_n (...) = delete; + ssize_t recv_n (...) = delete; }; /** diff --git a/ACE/ace/Managed_Object.h b/ACE/ace/Managed_Object.h index eed45cbbc23..0c648c4bbad 100644 --- a/ACE/ace/Managed_Object.h +++ b/ACE/ace/Managed_Object.h @@ -51,8 +51,8 @@ public: TYPE &object (); private: - ACE_UNIMPLEMENTED_FUNC (ACE_Cleanup_Adapter (const ACE_Cleanup_Adapter &)) - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Cleanup_Adapter &)) + ACE_Cleanup_Adapter (const ACE_Cleanup_Adapter &) = delete; + void operator= (const ACE_Cleanup_Adapter &) = delete; /// Contained object. TYPE object_; @@ -138,11 +138,11 @@ public: protected: // Disallow instantiation of this class. - ACE_UNIMPLEMENTED_FUNC (ACE_Managed_Object (void)) + ACE_Managed_Object (void) = delete; private: - ACE_UNIMPLEMENTED_FUNC (ACE_Managed_Object (const ACE_Managed_Object &)) - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Managed_Object &)) + ACE_Managed_Object (const ACE_Managed_Object &) = delete; + void operator= (const ACE_Managed_Object &) = delete; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Map_Manager.h b/ACE/ace/Map_Manager.h index 4ca68a32721..27b6b24fcc0 100644 --- a/ACE/ace/Map_Manager.h +++ b/ACE/ace/Map_Manager.h @@ -433,8 +433,8 @@ protected: private: // = Disallow these operations. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Map_Manager &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Map_Manager (const ACE_Map_Manager &)) + void operator= (const ACE_Map_Manager &) = delete; + ACE_Map_Manager (const ACE_Map_Manager &) = delete; }; /** diff --git a/ACE/ace/Map_T.h b/ACE/ace/Map_T.h index bb8938acaa3..51e89febc08 100644 --- a/ACE/ace/Map_T.h +++ b/ACE/ace/Map_T.h @@ -436,10 +436,9 @@ protected: virtual ACE_Reverse_Iterator_Impl > *rend_impl () = 0; private: - // = Disallow these operations. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Map &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Map (const ACE_Map &)) + void operator= (const ACE_Map &) = delete; + ACE_Map (const ACE_Map &) = delete; }; /** @@ -715,10 +714,9 @@ protected: virtual ACE_Reverse_Iterator_Impl > *rend_impl (); private: - // = Disallow these operations. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Map_Impl &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Map_Impl (const ACE_Map_Impl &)) + void operator= (const ACE_Map_Impl &) = delete; + ACE_Map_Impl (const ACE_Map_Impl &) = delete; }; /** @@ -1008,10 +1006,9 @@ protected: virtual ACE_Reverse_Iterator_Impl > *rend_impl (); private: - // = Disallow these operations. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Active_Map_Manager_Adapter &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Active_Map_Manager_Adapter (const ACE_Active_Map_Manager_Adapter &)) + void operator= (const ACE_Active_Map_Manager_Adapter &) = delete; + ACE_Active_Map_Manager_Adapter (const ACE_Active_Map_Manager_Adapter &) = delete; }; /** @@ -1292,10 +1289,9 @@ protected: virtual ACE_Reverse_Iterator_Impl > *rend_impl (); private: - // = Disallow these operations. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Hash_Map_Manager_Ex_Adapter &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Hash_Map_Manager_Ex_Adapter (const ACE_Hash_Map_Manager_Ex_Adapter &)) + void operator= (const ACE_Hash_Map_Manager_Ex_Adapter &) = delete; + ACE_Hash_Map_Manager_Ex_Adapter (const ACE_Hash_Map_Manager_Ex_Adapter &) = delete; }; /** @@ -1576,10 +1572,9 @@ protected: virtual ACE_Reverse_Iterator_Impl > *rend_impl (); private: - // = Disallow these operations. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Map_Manager_Adapter &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Map_Manager_Adapter (const ACE_Map_Manager_Adapter &)) + void operator= (const ACE_Map_Manager_Adapter &) = delete; + ACE_Map_Manager_Adapter (const ACE_Map_Manager_Adapter &) = delete; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Message_Block_T.h b/ACE/ace/Message_Block_T.h index d2e854d82cd..dc7f3e0ed50 100644 --- a/ACE/ace/Message_Block_T.h +++ b/ACE/ace/Message_Block_T.h @@ -63,8 +63,8 @@ private: ACE_LOCK lock_; // = Disallow these operations. - ACE_UNIMPLEMENTED_FUNC (ACE_Locked_Data_Block &operator= (const ACE_Locked_Data_Block &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Locked_Data_Block (const ACE_Locked_Data_Block &)) + ACE_Locked_Data_Block &operator= (const ACE_Locked_Data_Block &) = delete; + ACE_Locked_Data_Block (const ACE_Locked_Data_Block &) = delete; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Message_Queue_T.h b/ACE/ace/Message_Queue_T.h index 6bc74f3e191..bc49d81d80b 100644 --- a/ACE/ace/Message_Queue_T.h +++ b/ACE/ace/Message_Queue_T.h @@ -630,10 +630,9 @@ protected: #endif private: - // = Disallow these operations. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Message_Queue &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Message_Queue (const ACE_Message_Queue &)) + void operator= (const ACE_Message_Queue &) = delete; + ACE_Message_Queue (const ACE_Message_Queue &) = delete; }; // This typedef is used to get around a compiler bug in g++/vxworks. @@ -904,8 +903,8 @@ protected: private: // = Disallow public access to these operations. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Dynamic_Message_Queue &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Dynamic_Message_Queue (const ACE_Dynamic_Message_Queue &)) + void operator= (const ACE_Dynamic_Message_Queue &) = delete; + ACE_Dynamic_Message_Queue (const ACE_Dynamic_Message_Queue &) = delete; // provide definitions for these (just call base class method), // but make them private so they're not accessible outside the class @@ -913,7 +912,6 @@ private: /// Private method to hide public base class method: just calls base class method virtual int peek_dequeue_head (ACE_Message_Block *&first_item, ACE_Time_Value *timeout = 0); - }; /** diff --git a/ACE/ace/OS_Log_Msg_Attributes.h b/ACE/ace/OS_Log_Msg_Attributes.h index 356c9a7b7f8..9a51851a9cf 100644 --- a/ACE/ace/OS_Log_Msg_Attributes.h +++ b/ACE/ace/OS_Log_Msg_Attributes.h @@ -71,8 +71,8 @@ protected: #endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ private: - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_OS_Log_Msg_Attributes &)) - ACE_UNIMPLEMENTED_FUNC (ACE_OS_Log_Msg_Attributes (const ACE_OS_Log_Msg_Attributes &)) + void operator= (const ACE_OS_Log_Msg_Attributes &) = delete; + ACE_OS_Log_Msg_Attributes (const ACE_OS_Log_Msg_Attributes &) = delete; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Parse_Node.cpp b/ACE/ace/Parse_Node.cpp index 919635917d8..1456f742560 100644 --- a/ACE/ace/Parse_Node.cpp +++ b/ACE/ace/Parse_Node.cpp @@ -878,7 +878,7 @@ ACE_ALLOC_HOOK_DEFINE (ACE_Service_Type_Factory) ACE_Service_Type_Factory::ACE_Service_Type_Factory (ACE_TCHAR const *name, int type, ACE_Location_Node *location, - int active) + bool active) : name_ (name) , type_ (type) , location_ (location) diff --git a/ACE/ace/Parse_Node.h b/ACE/ace/Parse_Node.h index ffc9c419807..7686bdeb62c 100644 --- a/ACE/ace/Parse_Node.h +++ b/ACE/ace/Parse_Node.h @@ -70,8 +70,8 @@ private: ACE_Parse_Node *next_; private: - ACE_UNIMPLEMENTED_FUNC (ACE_Parse_Node (const ACE_Parse_Node&)) - ACE_UNIMPLEMENTED_FUNC (ACE_Parse_Node& operator= (const ACE_Parse_Node&)) + ACE_Parse_Node (const ACE_Parse_Node&) = delete; + ACE_Parse_Node& operator= (const ACE_Parse_Node&) = delete; }; /** @@ -98,8 +98,8 @@ public: ACE_ALLOC_HOOK_DECLARE; private: - ACE_UNIMPLEMENTED_FUNC (ACE_Suspend_Node (const ACE_Suspend_Node&)) - ACE_UNIMPLEMENTED_FUNC (ACE_Suspend_Node& operator= (const ACE_Suspend_Node&)) + ACE_Suspend_Node (const ACE_Suspend_Node&) = delete; + ACE_Suspend_Node& operator= (const ACE_Suspend_Node&) = delete; }; /** @@ -126,8 +126,8 @@ public: ACE_ALLOC_HOOK_DECLARE; private: - ACE_UNIMPLEMENTED_FUNC (ACE_Resume_Node (const ACE_Resume_Node&)) - ACE_UNIMPLEMENTED_FUNC (ACE_Resume_Node& operator= (const ACE_Resume_Node&)) + ACE_Resume_Node (const ACE_Resume_Node&) = delete; + ACE_Resume_Node& operator= (const ACE_Resume_Node&) = delete; }; /** @@ -154,8 +154,8 @@ public: ACE_ALLOC_HOOK_DECLARE; private: - ACE_UNIMPLEMENTED_FUNC (ACE_Remove_Node (const ACE_Remove_Node&)) - ACE_UNIMPLEMENTED_FUNC (ACE_Remove_Node& operator= (const ACE_Remove_Node&)) + ACE_Remove_Node (const ACE_Remove_Node&) = delete; + ACE_Remove_Node& operator= (const ACE_Remove_Node&) = delete; }; /** @@ -189,8 +189,8 @@ private: ACE_TCHAR *parameters_; private: - ACE_UNIMPLEMENTED_FUNC (ACE_Static_Node (const ACE_Static_Node&)) - ACE_UNIMPLEMENTED_FUNC (ACE_Static_Node& operator= (const ACE_Static_Node&)) + ACE_Static_Node (const ACE_Static_Node&) = delete; + ACE_Static_Node& operator= (const ACE_Static_Node&) = delete; }; @@ -226,8 +226,8 @@ private: ACE_Auto_Ptr factory_; private: - ACE_UNIMPLEMENTED_FUNC (ACE_Dynamic_Node (const ACE_Dynamic_Node&)) - ACE_UNIMPLEMENTED_FUNC (ACE_Dynamic_Node& operator= (const ACE_Dynamic_Node&)) + ACE_Dynamic_Node (const ACE_Dynamic_Node&) = delete; + ACE_Dynamic_Node& operator= (const ACE_Dynamic_Node&) = delete; }; /** @@ -259,8 +259,8 @@ private: const ACE_Parse_Node *mods_; private: - ACE_UNIMPLEMENTED_FUNC (ACE_Stream_Node (const ACE_Stream_Node&)) - ACE_UNIMPLEMENTED_FUNC (ACE_Stream_Node& operator= (const ACE_Stream_Node&)) + ACE_Stream_Node (const ACE_Stream_Node&) = delete; + ACE_Stream_Node& operator= (const ACE_Stream_Node&) = delete; }; /** @@ -291,8 +291,8 @@ private: const ACE_Parse_Node *mods_; private: - ACE_UNIMPLEMENTED_FUNC (ACE_Dummy_Node (const ACE_Dummy_Node&)) - ACE_UNIMPLEMENTED_FUNC (ACE_Dummy_Node& operator= (const ACE_Dummy_Node&)) + ACE_Dummy_Node (const ACE_Dummy_Node&) = delete; + ACE_Dummy_Node& operator= (const ACE_Dummy_Node&) = delete; }; /** @@ -348,8 +348,8 @@ protected: void *symbol_; private: - ACE_UNIMPLEMENTED_FUNC (ACE_Location_Node (const ACE_Location_Node&)) - ACE_UNIMPLEMENTED_FUNC (ACE_Location_Node& operator= (const ACE_Location_Node&)) + ACE_Location_Node (const ACE_Location_Node&) = delete; + ACE_Location_Node& operator= (const ACE_Location_Node&) = delete; }; /** @@ -381,8 +381,8 @@ private: const ACE_TCHAR *object_name_; private: - ACE_UNIMPLEMENTED_FUNC (ACE_Object_Node (const ACE_Object_Node&)) - ACE_UNIMPLEMENTED_FUNC (ACE_Object_Node& operator= (const ACE_Object_Node&)) + ACE_Object_Node (const ACE_Object_Node&) = delete; + ACE_Object_Node& operator= (const ACE_Object_Node&) = delete; }; /** @@ -436,8 +436,8 @@ private: const ACE_TCHAR *function_name_; private: - ACE_UNIMPLEMENTED_FUNC (ACE_Function_Node (const ACE_Function_Node&)) - ACE_UNIMPLEMENTED_FUNC (ACE_Function_Node& operator= (const ACE_Function_Node&)) + ACE_Function_Node (const ACE_Function_Node&) = delete; + ACE_Function_Node& operator= (const ACE_Function_Node&) = delete; }; /** @@ -471,20 +471,20 @@ private: const ACE_TCHAR *function_name_; private: - ACE_UNIMPLEMENTED_FUNC (ACE_Static_Function_Node (const ACE_Static_Function_Node&)) - ACE_UNIMPLEMENTED_FUNC (ACE_Static_Function_Node& operator= (const ACE_Static_Function_Node&)) + ACE_Static_Function_Node (const ACE_Static_Function_Node&) = delete; + ACE_Static_Function_Node& operator= (const ACE_Static_Function_Node&) = delete; }; /// A helper class used to safely register dynamic services, which may contains /// subordinate static services. It is used to capture the necessary data during -/// the parsing, but perform the actuall instantiation later. +/// the parsing, but perform the actual instantiation later. class ACE_Service_Type_Factory { public: ACE_Service_Type_Factory (ACE_TCHAR const *name, int type, ACE_Location_Node *location, - int active); + bool active); ~ACE_Service_Type_Factory (void); @@ -500,17 +500,14 @@ private: /** * Not implemented to enforce no copying */ - ACE_UNIMPLEMENTED_FUNC - (ACE_Service_Type_Factory(const ACE_Service_Type_Factory&)) - - ACE_UNIMPLEMENTED_FUNC - (ACE_Service_Type_Factory& operator=(const ACE_Service_Type_Factory&)) + ACE_Service_Type_Factory(const ACE_Service_Type_Factory&) = delete; + ACE_Service_Type_Factory& operator=(const ACE_Service_Type_Factory&) = delete; private: ACE_TString name_; int type_; ACE_Auto_Ptr location_; - int is_active_; + bool const is_active_; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/SSL/SSL_SOCK_Stream.h b/ACE/ace/SSL/SSL_SOCK_Stream.h index fdacb49d5f4..5a3a56a0f36 100644 --- a/ACE/ace/SSL/SSL_SOCK_Stream.h +++ b/ACE/ace/SSL/SSL_SOCK_Stream.h @@ -318,8 +318,8 @@ protected: const ACE_Time_Value *timeout) const; private: - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_SSL_SOCK_Stream &)) - ACE_UNIMPLEMENTED_FUNC (ACE_SSL_SOCK_Stream (const ACE_SSL_SOCK_Stream &)) + void operator= (const ACE_SSL_SOCK_Stream &) = delete; + ACE_SSL_SOCK_Stream (const ACE_SSL_SOCK_Stream &) = delete; protected: /// The SSL session. diff --git a/ACE/ace/Select_Reactor_T.h b/ACE/ace/Select_Reactor_T.h index f4cec8859ab..9d901691d14 100644 --- a/ACE/ace/Select_Reactor_T.h +++ b/ACE/ace/Select_Reactor_T.h @@ -687,8 +687,8 @@ protected: private: /// Deny access since member-wise won't work... - ACE_UNIMPLEMENTED_FUNC (ACE_Select_Reactor_T (const ACE_Select_Reactor_T &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Select_Reactor_T &operator= (const ACE_Select_Reactor_T &) ) + ACE_Select_Reactor_T (const ACE_Select_Reactor_T &) = delete; + ACE_Select_Reactor_T &operator= (const ACE_Select_Reactor_T &) = delete; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Singleton.h b/ACE/ace/Singleton.h index 68932be0fb7..6fe66a19239 100644 --- a/ACE/ace/Singleton.h +++ b/ACE/ace/Singleton.h @@ -197,8 +197,8 @@ protected: /// Contained instance. ACE_TSS_TYPE (TYPE) instance_; - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_TSS_Singleton &)) - ACE_UNIMPLEMENTED_FUNC (ACE_TSS_Singleton (const ACE_TSS_Singleton &)) + void operator= (const ACE_TSS_Singleton &) = delete; + ACE_TSS_Singleton (const ACE_TSS_Singleton &) = delete; #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) /// Pointer to the Singleton (ACE_Cleanup) instance. diff --git a/ACE/ace/Task_T.h b/ACE/ace/Task_T.h index 708afff2256..69b235668e7 100644 --- a/ACE/ace/Task_T.h +++ b/ACE/ace/Task_T.h @@ -168,10 +168,9 @@ public: // Should be protected: ACE_ALLOC_HOOK_DECLARE; private: - // = Disallow these operations. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Task &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Task (const ACE_Task &)) + void operator= (const ACE_Task &) = delete; + ACE_Task (const ACE_Task &) = delete; }; #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT diff --git a/ACE/ace/Timer_Hash_T.h b/ACE/ace/Timer_Hash_T.h index b21b1e9d82d..fa0a7337ef0 100644 --- a/ACE/ace/Timer_Hash_T.h +++ b/ACE/ace/Timer_Hash_T.h @@ -332,8 +332,8 @@ private: ACE_Locked_Free_List, ACE_Null_Mutex> token_list_; // = Don't allow these operations for now. - ACE_UNIMPLEMENTED_FUNC (ACE_Timer_Hash_T (const ACE_Timer_Hash_T &)) - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Timer_Hash_T &)) + ACE_Timer_Hash_T (const ACE_Timer_Hash_T &) = delete; + void operator= (const ACE_Timer_Hash_T &) = delete; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Timer_List_T.h b/ACE/ace/Timer_List_T.h index 25abceadf82..81c5e20fed9 100644 --- a/ACE/ace/Timer_List_T.h +++ b/ACE/ace/Timer_List_T.h @@ -213,8 +213,8 @@ private: long id_counter_; // = Don't allow these operations for now. - ACE_UNIMPLEMENTED_FUNC (ACE_Timer_List_T (const ACE_Timer_List_T &)) - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Timer_List_T &)) + ACE_Timer_List_T (const ACE_Timer_List_T &) = delete; + void operator= (const ACE_Timer_List_T &) = delete; }; #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -- cgit v1.2.1