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/Parse_Node.h | 61 +++++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 32 deletions(-) (limited to 'ACE/ace/Parse_Node.h') 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 -- cgit v1.2.1