diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2022-01-10 17:02:33 +0100 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2022-01-10 17:02:33 +0100 |
commit | 48e842b9afeb089a4f3d5c5011c69ea75f99631d (patch) | |
tree | a1829c0e7dacba4d5e1360dbe85b2a3a37c08013 | |
parent | cacd3ed5e1b549e9adb7c8701ca33d6996ea532d (diff) | |
download | ATCD-48e842b9afeb089a4f3d5c5011c69ea75f99631d.tar.gz |
Make use of C++11 default and override
* TAO/tao/Codeset/Codeset_Manager_i.cpp:
* TAO/tao/Codeset/Codeset_Manager_i.h:
* TAO/tao/Codeset/Codeset_Service_Context_Handler.h:
* TAO/tao/Codeset/Codeset_Translator_Factory.cpp:
* TAO/tao/Codeset/Codeset_Translator_Factory.h:
* TAO/tao/Codeset/Codeset_Translator_Factory_T.cpp:
* TAO/tao/Codeset/Codeset_Translator_Factory_T.h:
* TAO/tao/Codeset/UTF16_BOM_Factory.cpp:
* TAO/tao/Codeset/UTF16_BOM_Factory.h:
* TAO/tao/Codeset/UTF16_BOM_Translator.cpp:
* TAO/tao/Codeset/UTF16_BOM_Translator.h:
* TAO/tao/Codeset/UTF8_Latin1_Factory.cpp:
* TAO/tao/Codeset/UTF8_Latin1_Factory.h:
* TAO/tao/Codeset/UTF8_Latin1_Translator.cpp:
* TAO/tao/Codeset/UTF8_Latin1_Translator.h:
-rw-r--r-- | TAO/tao/Codeset/Codeset_Manager_i.cpp | 10 | ||||
-rw-r--r-- | TAO/tao/Codeset/Codeset_Manager_i.h | 5 | ||||
-rw-r--r-- | TAO/tao/Codeset/Codeset_Service_Context_Handler.h | 10 | ||||
-rw-r--r-- | TAO/tao/Codeset/Codeset_Translator_Factory.cpp | 10 | ||||
-rw-r--r-- | TAO/tao/Codeset/Codeset_Translator_Factory.h | 4 | ||||
-rw-r--r-- | TAO/tao/Codeset/Codeset_Translator_Factory_T.cpp | 6 | ||||
-rw-r--r-- | TAO/tao/Codeset/Codeset_Translator_Factory_T.h | 5 | ||||
-rw-r--r-- | TAO/tao/Codeset/UTF16_BOM_Factory.cpp | 6 | ||||
-rw-r--r-- | TAO/tao/Codeset/UTF16_BOM_Factory.h | 6 | ||||
-rw-r--r-- | TAO/tao/Codeset/UTF16_BOM_Translator.cpp | 4 | ||||
-rw-r--r-- | TAO/tao/Codeset/UTF16_BOM_Translator.h | 7 | ||||
-rw-r--r-- | TAO/tao/Codeset/UTF8_Latin1_Factory.cpp | 5 | ||||
-rw-r--r-- | TAO/tao/Codeset/UTF8_Latin1_Factory.h | 4 | ||||
-rw-r--r-- | TAO/tao/Codeset/UTF8_Latin1_Translator.cpp | 13 | ||||
-rw-r--r-- | TAO/tao/Codeset/UTF8_Latin1_Translator.h | 11 |
15 files changed, 24 insertions, 82 deletions
diff --git a/TAO/tao/Codeset/Codeset_Manager_i.cpp b/TAO/tao/Codeset/Codeset_Manager_i.cpp index 019486489e7..f190a4e8857 100644 --- a/TAO/tao/Codeset/Codeset_Manager_i.cpp +++ b/TAO/tao/Codeset/Codeset_Manager_i.cpp @@ -57,7 +57,7 @@ TAO_Codeset_Manager_i::default_char_codeset = TAO_DEFAULT_CHAR_CODESET_ID; CONV_FRAME::CodeSetId TAO_Codeset_Manager_i::default_wchar_codeset = TAO_DEFAULT_WCHAR_CODESET_ID; -TAO_Codeset_Manager_i::TAO_Codeset_Manager_i (void) +TAO_Codeset_Manager_i::TAO_Codeset_Manager_i () : codeset_info_ (), char_descriptor_ (), wchar_descriptor_ () @@ -70,18 +70,14 @@ TAO_Codeset_Manager_i::TAO_Codeset_Manager_i (void) } -TAO_Codeset_Manager_i::~TAO_Codeset_Manager_i (void) -{ -} - TAO_Codeset_Descriptor_Base * -TAO_Codeset_Manager_i::char_codeset_descriptor (void) +TAO_Codeset_Manager_i::char_codeset_descriptor () { return &this->char_descriptor_; } TAO_Codeset_Descriptor_Base * -TAO_Codeset_Manager_i::wchar_codeset_descriptor (void) +TAO_Codeset_Manager_i::wchar_codeset_descriptor () { return &this->wchar_descriptor_; } diff --git a/TAO/tao/Codeset/Codeset_Manager_i.h b/TAO/tao/Codeset/Codeset_Manager_i.h index 1daa14d8fab..39a190c393b 100644 --- a/TAO/tao/Codeset/Codeset_Manager_i.h +++ b/TAO/tao/Codeset/Codeset_Manager_i.h @@ -56,7 +56,6 @@ class TAO_Codeset_Descriptor; class TAO_Codeset_Export TAO_Codeset_Manager_i : public TAO_Codeset_Manager { - public: /// NCS for char is defaulted to ISO 8859-1:1987; Latin Alphabet /// No. 1 @@ -65,8 +64,8 @@ public: /// to provide a non-compliant default wchar codeset may do so. static CONV_FRAME::CodeSetId default_wchar_codeset; - TAO_Codeset_Manager_i (void); - ~TAO_Codeset_Manager_i (void); + TAO_Codeset_Manager_i (); + ~TAO_Codeset_Manager_i () = default; /// Called by an object of TAO_Acceptor to set NCS and CCS values /// for Char/Wchar in to the Object Reference. diff --git a/TAO/tao/Codeset/Codeset_Service_Context_Handler.h b/TAO/tao/Codeset/Codeset_Service_Context_Handler.h index 05d55d8d12b..9382fb70e26 100644 --- a/TAO/tao/Codeset/Codeset_Service_Context_Handler.h +++ b/TAO/tao/Codeset/Codeset_Service_Context_Handler.h @@ -27,15 +27,15 @@ class TAO_Codeset_Service_Context_Handler : public TAO_Service_Context_Handler { public: - virtual int process_service_context (TAO_Transport& transport, - const IOP::ServiceContext& context, - TAO_ServerRequest *request); - virtual int generate_service_context ( + int process_service_context (TAO_Transport& transport, + const IOP::ServiceContext& context, + TAO_ServerRequest *request) override; + int generate_service_context ( TAO_Stub* stub, TAO_Transport &transport, TAO_Operation_Details &opdetails, TAO_Target_Specification &spec, - TAO_OutputCDR &msg); + TAO_OutputCDR &msg) override; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Codeset/Codeset_Translator_Factory.cpp b/TAO/tao/Codeset/Codeset_Translator_Factory.cpp index 7a18e518a89..8f1c005055c 100644 --- a/TAO/tao/Codeset/Codeset_Translator_Factory.cpp +++ b/TAO/tao/Codeset/Codeset_Translator_Factory.cpp @@ -16,16 +16,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Codeset_Translator_Factory::TAO_Codeset_Translator_Factory () -{ - -} - -TAO_Codeset_Translator_Factory::~TAO_Codeset_Translator_Factory () -{ - -} - int TAO_Codeset_Translator_Factory::init (int , ACE_TCHAR **) { diff --git a/TAO/tao/Codeset/Codeset_Translator_Factory.h b/TAO/tao/Codeset/Codeset_Translator_Factory.h index 422d6bfe10f..6f4c513a141 100644 --- a/TAO/tao/Codeset/Codeset_Translator_Factory.h +++ b/TAO/tao/Codeset/Codeset_Translator_Factory.h @@ -54,8 +54,8 @@ class TAO_Codeset_Export TAO_Codeset_Translator_Factory : public ACE_Service_Object { public: - TAO_Codeset_Translator_Factory (); - virtual ~TAO_Codeset_Translator_Factory (); + TAO_Codeset_Translator_Factory () = default; + virtual ~TAO_Codeset_Translator_Factory () = default; virtual int init (int argc, ACE_TCHAR *argv[]); protected: diff --git a/TAO/tao/Codeset/Codeset_Translator_Factory_T.cpp b/TAO/tao/Codeset/Codeset_Translator_Factory_T.cpp index 08768c5d497..62bd93a7821 100644 --- a/TAO/tao/Codeset/Codeset_Translator_Factory_T.cpp +++ b/TAO/tao/Codeset/Codeset_Translator_Factory_T.cpp @@ -20,12 +20,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<class NCS_TO_TCS> -TAO_Codeset_Translator_Factory_T<NCS_TO_TCS>::TAO_Codeset_Translator_Factory_T () : - translator_(0) -{ -} - -template<class NCS_TO_TCS> TAO_Codeset_Translator_Factory_T<NCS_TO_TCS>::~TAO_Codeset_Translator_Factory_T () { delete translator_; diff --git a/TAO/tao/Codeset/Codeset_Translator_Factory_T.h b/TAO/tao/Codeset/Codeset_Translator_Factory_T.h index 3e470285c63..6819b1b7027 100644 --- a/TAO/tao/Codeset/Codeset_Translator_Factory_T.h +++ b/TAO/tao/Codeset/Codeset_Translator_Factory_T.h @@ -38,8 +38,7 @@ class TAO_Codeset_Translator_Factory_T : public TAO_Codeset_Translator_Factory { public: - - TAO_Codeset_Translator_Factory_T (); + TAO_Codeset_Translator_Factory_T () = default; virtual ~TAO_Codeset_Translator_Factory_T (); /// initialize the factory service object. Instantiates the translator. @@ -62,7 +61,7 @@ public: virtual void assign (TAO_OutputCDR *) const; private: - NCS_TO_TCS *translator_; + NCS_TO_TCS *translator_ {}; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Codeset/UTF16_BOM_Factory.cpp b/TAO/tao/Codeset/UTF16_BOM_Factory.cpp index e28f77b164f..207fc0ab467 100644 --- a/TAO/tao/Codeset/UTF16_BOM_Factory.cpp +++ b/TAO/tao/Codeset/UTF16_BOM_Factory.cpp @@ -27,12 +27,6 @@ ACE_STATIC_SVC_DEFINE (TAO_UTF16_BOM_Factory, 0) ACE_FACTORY_DEFINE (TAO_Codeset, TAO_UTF16_BOM_Factory) -TAO_UTF16_BOM_Factory::TAO_UTF16_BOM_Factory () - : translator_ (0) - , forceBE_ (false) -{ -} - TAO_UTF16_BOM_Factory::~TAO_UTF16_BOM_Factory () { delete this->translator_; diff --git a/TAO/tao/Codeset/UTF16_BOM_Factory.h b/TAO/tao/Codeset/UTF16_BOM_Factory.h index 3d9e6e550a9..56a711b3602 100644 --- a/TAO/tao/Codeset/UTF16_BOM_Factory.h +++ b/TAO/tao/Codeset/UTF16_BOM_Factory.h @@ -27,7 +27,7 @@ class TAO_Codeset_Export TAO_UTF16_BOM_Factory : public TAO_Codeset_Translator_Factory { public: - TAO_UTF16_BOM_Factory (); + TAO_UTF16_BOM_Factory () = default; virtual ~TAO_UTF16_BOM_Factory (); virtual int init (int argc, ACE_TCHAR *argv[]); @@ -52,9 +52,9 @@ private: int parse_one_arg (int argc, ACE_TCHAR *argv[]); private: - TAO_UTF16_BOM_Translator *translator_; + TAO_UTF16_BOM_Translator *translator_ {}; /// Force big endian wchar, warray, & wstring - bool forceBE_; + bool forceBE_ {false}; }; ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Codeset, TAO_UTF16_BOM_Factory) diff --git a/TAO/tao/Codeset/UTF16_BOM_Translator.cpp b/TAO/tao/Codeset/UTF16_BOM_Translator.cpp index db3df08c895..16f3cd0d2ac 100644 --- a/TAO/tao/Codeset/UTF16_BOM_Translator.cpp +++ b/TAO/tao/Codeset/UTF16_BOM_Translator.cpp @@ -39,10 +39,6 @@ TAO_UTF16_BOM_Translator::TAO_UTF16_BOM_Translator (bool forceBE) ACE_TEXT("forceBE %d\n"), this->forceBE_ ? 1:0 )); } -TAO_UTF16_BOM_Translator::~TAO_UTF16_BOM_Translator (void) -{ -} - // = Documented in $ACE_ROOT/ace/CDR_Stream.h ACE_CDR::Boolean TAO_UTF16_BOM_Translator::read_wchar (ACE_InputCDR &cdr, ACE_CDR::WChar &x) diff --git a/TAO/tao/Codeset/UTF16_BOM_Translator.h b/TAO/tao/Codeset/UTF16_BOM_Translator.h index 19c3b8eb159..9bb00292032 100644 --- a/TAO/tao/Codeset/UTF16_BOM_Translator.h +++ b/TAO/tao/Codeset/UTF16_BOM_Translator.h @@ -21,10 +21,6 @@ #include "tao/Codeset/codeset_export.h" #include "tao/Versioned_Namespace.h" #include "ace/CDR_Stream.h" - - -// **************************************************************** - TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** @@ -45,7 +41,7 @@ public: TAO_UTF16_BOM_Translator (bool forceBE); /// Virtual destruction - virtual ~TAO_UTF16_BOM_Translator (void); + virtual ~TAO_UTF16_BOM_Translator () = default; // = Documented in $ACE_ROOT/ace/CDR_Stream.h virtual ACE_CDR::Boolean read_wchar (ACE_InputCDR &, @@ -92,7 +88,6 @@ private: private: /// if this flag is true, force wchar's to big endian order bool forceBE_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp b/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp index 825790771c4..bc4070431a3 100644 --- a/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp +++ b/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp @@ -15,11 +15,6 @@ ACE_STATIC_SVC_DEFINE (TAO_UTF8_Latin1_Factory, ACE_FACTORY_DEFINE (TAO_Codeset, TAO_UTF8_Latin1_Factory) -TAO_UTF8_Latin1_Factory::TAO_UTF8_Latin1_Factory() - : translator_ (0) -{ -} - TAO_UTF8_Latin1_Factory::~TAO_UTF8_Latin1_Factory () { delete this->translator_; diff --git a/TAO/tao/Codeset/UTF8_Latin1_Factory.h b/TAO/tao/Codeset/UTF8_Latin1_Factory.h index 4ccd8ff75b8..8a47a720675 100644 --- a/TAO/tao/Codeset/UTF8_Latin1_Factory.h +++ b/TAO/tao/Codeset/UTF8_Latin1_Factory.h @@ -15,7 +15,7 @@ class TAO_Codeset_Export TAO_UTF8_Latin1_Factory : public TAO_Codeset_Translator_Factory { public: - TAO_UTF8_Latin1_Factory (); + TAO_UTF8_Latin1_Factory () = default; virtual ~TAO_UTF8_Latin1_Factory (); virtual int init (int argc, ACE_TCHAR *argv[]); @@ -39,7 +39,7 @@ private: void create_translator () const; private: - TAO_UTF8_Latin1_Translator *translator_; + TAO_UTF8_Latin1_Translator *translator_ {}; }; diff --git a/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp b/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp index 44f03eb740c..4ae488e3df1 100644 --- a/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp +++ b/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp @@ -15,21 +15,8 @@ #include "tao/debug.h" #include "ace/OS_Memory.h" -// **************************************************************** - TAO_BEGIN_VERSIONED_NAMESPACE_DECL -///////////////////////////// -// UTF8_Latin1_Translator implementation - -TAO_UTF8_Latin1_Translator::TAO_UTF8_Latin1_Translator () -{ -} - -TAO_UTF8_Latin1_Translator::~TAO_UTF8_Latin1_Translator (void) -{ -} - // = Documented in $ACE_ROOT/ace/CDR_Stream.h ACE_CDR::Boolean TAO_UTF8_Latin1_Translator::read_char (ACE_InputCDR &cdr, ACE_CDR::Char &x) diff --git a/TAO/tao/Codeset/UTF8_Latin1_Translator.h b/TAO/tao/Codeset/UTF8_Latin1_Translator.h index 6bccd0bee8c..8198f6f8145 100644 --- a/TAO/tao/Codeset/UTF8_Latin1_Translator.h +++ b/TAO/tao/Codeset/UTF8_Latin1_Translator.h @@ -46,10 +46,10 @@ class TAO_Codeset_Export TAO_UTF8_Latin1_Translator { public: /// constructor - TAO_UTF8_Latin1_Translator (); + TAO_UTF8_Latin1_Translator () = default; /// Virtual destruction - virtual ~TAO_UTF8_Latin1_Translator (void); + virtual ~TAO_UTF8_Latin1_Translator () = default; // = Documented in $ACE_ROOT/ace/CDR_Stream.h virtual ACE_CDR::Boolean read_char (ACE_InputCDR &, @@ -73,12 +73,9 @@ public: virtual ACE_CDR::ULong tcs () {return 0x05010001U;} private: - ACE_CDR::ULong read_char_i (ACE_InputCDR &, - ACE_CDR::Char &); - - ACE_CDR::Boolean write_char_i (ACE_OutputCDR &, - ACE_CDR::Char); + ACE_CDR::ULong read_char_i (ACE_InputCDR &, ACE_CDR::Char &); + ACE_CDR::Boolean write_char_i (ACE_OutputCDR &, ACE_CDR::Char); }; TAO_END_VERSIONED_NAMESPACE_DECL |