From c3e71f69e85deb48d5f3cdba355679da4deffdb3 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 1 Feb 2023 10:51:23 +0100 Subject: good_bit is a bool and removed some uncessary c-style casts --- ACE/ace/CDR_Size.inl | 48 ++++++++-------- ACE/ace/CDR_Stream.inl | 64 ++++++++++------------ TAO/tao/GIOP_Message_Generator_Parser_10.cpp | 4 +- TAO/tao/GIOP_Message_Generator_Parser_12.cpp | 2 +- TAO/tao/Object.cpp | 8 +-- TAO/tao/Principal.cpp | 4 +- TAO/tao/Profile.cpp | 4 +- TAO/tao/Stub.cpp | 2 +- TAO/tao/Tagged_Profile.cpp | 6 +- TAO/tao/Valuetype/AbstractBase.cpp | 2 +- TAO/tao/Valuetype/ValueBase.cpp | 8 +-- .../Char_IBM1047_ISO8859_Translator.cpp | 4 +- TAO/utils/catior/Catior_i.cpp | 12 ++-- 13 files changed, 80 insertions(+), 88 deletions(-) diff --git a/ACE/ace/CDR_Size.inl b/ACE/ace/CDR_Size.inl index 5d5edca3247..29cc5ac9a76 100644 --- a/ACE/ace/CDR_Size.inl +++ b/ACE/ace/CDR_Size.inl @@ -43,7 +43,7 @@ ACE_SizeCDR::write_octet (ACE_CDR::Octet x) ACE_INLINE ACE_CDR::Boolean ACE_SizeCDR::write_boolean (ACE_CDR::Boolean x) { - return (ACE_CDR::Boolean) this->write_octet (x ? (ACE_CDR::Octet) 1 : (ACE_CDR::Octet) 0); + return this->write_octet (x ? (ACE_CDR::Octet) 1 : (ACE_CDR::Octet) 0); } ACE_INLINE ACE_CDR::Boolean @@ -184,7 +184,7 @@ ACE_SizeCDR::write_wchar_array (const ACE_CDR::WChar* x, if (ACE_OutputCDR::wchar_maxbytes () == 0) { errno = EACCES; - return (ACE_CDR::Boolean) (this->good_bit_ = false); + return (this->good_bit_ = false); } if (ACE_OutputCDR::wchar_maxbytes () == sizeof (ACE_CDR::WChar)) return this->write_array (x, @@ -305,98 +305,98 @@ ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, ACE_CDR::Char x) { ss.write_char (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, ACE_CDR::Short x) { ss.write_short (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, ACE_CDR::UShort x) { ss.write_ushort (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, ACE_CDR::Long x) { ss.write_long (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, ACE_CDR::ULong x) { ss.write_ulong (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, ACE_CDR::LongLong x) { ss.write_longlong (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, ACE_CDR::ULongLong x) { ss.write_ulonglong (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, ACE_CDR::LongDouble x) { ss.write_longdouble (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, ACE_CDR::Float x) { ss.write_float (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, ACE_CDR::Double x) { ss.write_double (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, const ACE_CDR::Fixed &x) { ss.write_fixed (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, const ACE_CDR::Char *x) { ss.write_string (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, const ACE_CDR::WChar *x) { ss.write_wstring (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, const std::string& x) { ss.write_string (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } #if !defined(ACE_LACKS_STD_WSTRING) @@ -404,7 +404,7 @@ ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, const std::wstring& x) { ss.write_wstring (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } #endif @@ -413,28 +413,28 @@ ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, ACE_OutputCDR::from_boolean x) { ss.write_boolean (x.val_); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, ACE_OutputCDR::from_char x) { ss.write_char (x.val_); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, ACE_OutputCDR::from_wchar x) { ss.write_wchar (x.val_); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, ACE_OutputCDR::from_octet x) { ss.write_octet (x.val_); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean @@ -448,8 +448,7 @@ operator<< (ACE_SizeCDR &ss, ACE_OutputCDR::from_string x) } ss.write_string (len, x.val_); - return - (ACE_CDR::Boolean) (ss.good_bit () && (!x.bound_ || len <= x.bound_)); + return (ss.good_bit () && (!x.bound_ || len <= x.bound_)); } ACE_INLINE ACE_CDR::Boolean @@ -463,8 +462,7 @@ operator<< (ACE_SizeCDR &ss, ACE_OutputCDR::from_wstring x) } ss.write_wstring (len, x.val_); - return - (ACE_CDR::Boolean) (ss.good_bit () && (!x.bound_ || len <= x.bound_)); + return (ss.good_bit () && (!x.bound_ || len <= x.bound_)); } diff --git a/ACE/ace/CDR_Stream.inl b/ACE/ace/CDR_Stream.inl index 5f0a55da680..4d68cdb8b08 100644 --- a/ACE/ace/CDR_Stream.inl +++ b/ACE/ace/CDR_Stream.inl @@ -413,7 +413,7 @@ ACE_OutputCDR::write_wchar_array (const ACE_CDR::WChar* x, if (ACE_OutputCDR::wchar_maxbytes_ == 0) { errno = EACCES; - return (ACE_CDR::Boolean) (this->good_bit_ = false); + return (this->good_bit_ = false); } if (ACE_OutputCDR::wchar_maxbytes_ == sizeof (ACE_CDR::WChar)) @@ -742,7 +742,7 @@ ACE_InputCDR::read_boolean (ACE_CDR::Boolean& x) ACE_CDR::Octet tmp = 0; (void) this->read_octet (tmp); x = tmp ? true : false; - return (ACE_CDR::Boolean) this->good_bit_; + return this->good_bit_; } ACE_INLINE ACE_CDR::Boolean @@ -1271,114 +1271,110 @@ ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_CDR::Char x) { os.write_char (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_CDR::Short x) { os.write_short (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_CDR::UShort x) { os.write_ushort (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_CDR::Long x) { os.write_long (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_CDR::ULong x) { os.write_ulong (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_CDR::LongLong x) { os.write_longlong (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_CDR::ULongLong x) { os.write_ulonglong (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_CDR::LongDouble x) { os.write_longdouble (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_CDR::Float x) { os.write_float (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_CDR::Double x) { os.write_double (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, const ACE_CDR::Fixed &x) { os.write_fixed (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, const ACE_CDR::Char *x) { os.write_string (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, const ACE_CDR::WChar *x) { os.write_wstring (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_std_string x) { - ACE_CDR::ULong const len = - static_cast (x.val_.size ()); + ACE_CDR::ULong const len = static_cast (x.val_.size ()); os.write_string (len, x.val_.c_str ()); - return - (ACE_CDR::Boolean) (os.good_bit () && (!x.bound_ || len <= x.bound_)); + return (os.good_bit () && (!x.bound_ || len <= x.bound_)); } #if !defined(ACE_LACKS_STD_WSTRING) ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_std_wstring x) { - ACE_CDR::ULong const len = - static_cast (x.val_.size ()); + ACE_CDR::ULong const len = static_cast (x.val_.size ()); os.write_wstring (len, x.val_.c_str ()); - return - (ACE_CDR::Boolean) (os.good_bit () && (!x.bound_ || len <= x.bound_)); + return (os.good_bit () && (!x.bound_ || len <= x.bound_)); } #endif @@ -1386,7 +1382,7 @@ ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, const std::string& x) { os.write_string (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } #if !defined(ACE_LACKS_STD_WSTRING) @@ -1394,7 +1390,7 @@ ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, const std::wstring& x) { os.write_wstring (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } #endif @@ -1403,28 +1399,28 @@ ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_boolean x) { (void) os.write_boolean (x.val_); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_char x) { os.write_char (x.val_); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_wchar x) { os.write_wchar (x.val_); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_octet x) { os.write_octet (x.val_); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean @@ -1438,8 +1434,7 @@ operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_string x) } os.write_string (len, x.val_); - return - (ACE_CDR::Boolean) (os.good_bit () && (!x.bound_ || len <= x.bound_)); + return (ACE_(os.good_bit () && (!x.bound_ || len <= x.bound_)); } ACE_INLINE ACE_CDR::Boolean @@ -1453,22 +1448,21 @@ operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_wstring x) } os.write_wstring (len, x.val_); - return - (ACE_CDR::Boolean) (os.good_bit () && (!x.bound_ || len <= x.bound_)); + return (os.good_bit () && (!x.bound_ || len <= x.bound_)); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_uint8 x) { os.write_uint8 (x.val_); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_int8 x) { os.write_int8 (x.val_); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } // **************************************************************** diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp index d5bb7996fa8..de75c05f61d 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp @@ -333,7 +333,7 @@ TAO_GIOP_Message_Generator_Parser_10::parse_request_header ( if (!(input >> service_info)) return -1; - CORBA::Boolean hdr_status = (CORBA::Boolean) input.good_bit (); + CORBA::Boolean hdr_status = input.good_bit (); CORBA::ULong req_id = 0; @@ -392,7 +392,7 @@ TAO_GIOP_Message_Generator_Parser_10::parse_request_header ( CORBA::OctetSeq oct_seq; input >> oct_seq; request.requesting_principal (oct_seq); - hdr_status = (CORBA::Boolean) input.good_bit (); + hdr_status = input.good_bit (); } return hdr_status ? 0 : -1; diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp index 6396db7a269..7cbadbbc658 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp @@ -225,7 +225,7 @@ TAO_GIOP_Message_Generator_Parser_12::parse_request_header ( // Get the input CDR in the request class TAO_InputCDR & input = *request.incoming (); - CORBA::Boolean hdr_status = (CORBA::Boolean) input.good_bit (); + CORBA::Boolean hdr_status = input.good_bit (); CORBA::ULong req_id = 0; // Get the rest of the request header ... diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index f1be9002e7d..1fdb4a980ec 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -136,7 +136,7 @@ CORBA::Object::marshal (const CORBA::Object_ptr x, TAO_OutputCDR &cdr) cdr.write_ulong (1); cdr.write_char ('\0'); cdr.write_ulong (0); - return (CORBA::Boolean) cdr.good_bit (); + return cdr.good_bit (); } return x->marshal (cdr); @@ -707,7 +707,7 @@ operator<< (TAO_OutputCDR& cdr, const CORBA::Object* x) cdr.write_ulong (1); cdr.write_char ('\0'); cdr.write_ulong (0); - return (CORBA::Boolean) cdr.good_bit (); + return cdr.good_bit (); } if (!x->is_evaluated ()) @@ -873,7 +873,7 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x) if (profile_count == 0) { x = CORBA::Object::_nil (); - return (CORBA::Boolean) cdr.good_bit (); + return cdr.good_bit (); } // get a profile container to store all profiles in the IOR. @@ -981,7 +981,7 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x) } } - return (CORBA::Boolean) cdr.good_bit (); + return cdr.good_bit (); } #if defined (GEN_OSTREAM_OPS) diff --git a/TAO/tao/Principal.cpp b/TAO/tao/Principal.cpp index a8710e3b283..7b5f1c318cb 100644 --- a/TAO/tao/Principal.cpp +++ b/TAO/tao/Principal.cpp @@ -34,7 +34,7 @@ operator<< (TAO_OutputCDR & cdr, CORBA::Principal * x) cdr.write_ulong (0); } - return (CORBA::Boolean) cdr.good_bit (); + return cdr.good_bit (); } CORBA::Boolean @@ -54,7 +54,7 @@ operator>> (TAO_InputCDR & cdr, CORBA::Principal *& x) cdr.read_octet_array (x->id.get_buffer (), length); } - return (CORBA::Boolean) cdr.good_bit (); + return cdr.good_bit (); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp index 9bc48cb6352..6465f4ef0a2 100644 --- a/TAO/tao/Profile.cpp +++ b/TAO/tao/Profile.cpp @@ -889,7 +889,7 @@ operator<< (TAO_OutputCDR& cdr, const TAO_opaque& x) cdr.write_octet_array (x.get_buffer (), length); } - return (CORBA::Boolean) cdr.good_bit (); + return cdr.good_bit (); } CORBA::Boolean @@ -917,7 +917,7 @@ operator>>(TAO_InputCDR& cdr, TAO_opaque& x) cdr.read_octet_array (x.get_buffer (), length); } - return (CORBA::Boolean) cdr.good_bit (); + return cdr.good_bit (); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp index c132daaeef9..4517c747428 100644 --- a/TAO/tao/Stub.cpp +++ b/TAO/tao/Stub.cpp @@ -569,7 +569,7 @@ TAO_Stub::marshal (TAO_OutputCDR &cdr) // release ACE_Lock } - return (CORBA::Boolean) cdr.good_bit (); + return cdr.good_bit (); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Tagged_Profile.cpp b/TAO/tao/Tagged_Profile.cpp index e1fc756e517..2731ea66fb4 100644 --- a/TAO/tao/Tagged_Profile.cpp +++ b/TAO/tao/Tagged_Profile.cpp @@ -87,7 +87,7 @@ TAO_Tagged_Profile::unmarshall_object_key (TAO_InputCDR &input) CORBA::Boolean TAO_Tagged_Profile::unmarshall_object_key_i (TAO_InputCDR &input) { - CORBA::Boolean hdr_status = (CORBA::Boolean) input.good_bit (); + CORBA::Boolean hdr_status = input.good_bit (); CORBA::Long key_length = 0; hdr_status = hdr_status && input.read_long (key_length); @@ -110,7 +110,7 @@ TAO_Tagged_Profile::unmarshall_object_key_i (TAO_InputCDR &input) CORBA::Boolean TAO_Tagged_Profile::unmarshall_iop_profile_i (TAO_InputCDR &input) { - CORBA::Boolean hdr_status = (CORBA::Boolean) input.good_bit (); + CORBA::Boolean hdr_status = input.good_bit (); // Extract into the IOP::Tagged profile. hdr_status &= input >> this->profile_; @@ -121,7 +121,7 @@ TAO_Tagged_Profile::unmarshall_iop_profile_i (TAO_InputCDR &input) CORBA::Boolean TAO_Tagged_Profile::unmarshall_ref_addr_i (TAO_InputCDR &input) { - CORBA::Boolean hdr_status = (CORBA::Boolean) input.good_bit (); + CORBA::Boolean hdr_status = input.good_bit (); /* * The GIOP::IORAddressingInfo is defined as follows diff --git a/TAO/tao/Valuetype/AbstractBase.cpp b/TAO/tao/Valuetype/AbstractBase.cpp index c6785f74a25..f9bddb40e11 100644 --- a/TAO/tao/Valuetype/AbstractBase.cpp +++ b/TAO/tao/Valuetype/AbstractBase.cpp @@ -197,7 +197,7 @@ operator<< (TAO_OutputCDR &strm, const CORBA::AbstractBase_ptr abs) } } - return (CORBA::Boolean) strm.good_bit (); + return strm.good_bit (); } } else diff --git a/TAO/tao/Valuetype/ValueBase.cpp b/TAO/tao/Valuetype/ValueBase.cpp index 3a92ae576d7..2fa3079f778 100644 --- a/TAO/tao/Valuetype/ValueBase.cpp +++ b/TAO/tao/Valuetype/ValueBase.cpp @@ -1251,7 +1251,7 @@ CORBA::ValueBase::_tao_read_codebase_url (TAO_InputCDR& strm, if (!strm.read_ulong (length)) { - return 0; + return false; } VERIFY_MAP (TAO_InputCDR, codebase_url_map, Codebase_URL_Map); @@ -1276,11 +1276,11 @@ CORBA::ValueBase::_tao_read_codebase_url (TAO_InputCDR& strm, if (!url_stream.good_bit ()) { - return 0; + return false; } if (! url_stream.read_string (codebase_url)) - return 0; + return false; // It's possible the codebase url is read again from an indirection stream, // so make sure the codebase url is the same. @@ -1316,7 +1316,7 @@ CORBA::ValueBase::_tao_read_codebase_url (TAO_InputCDR& strm, strm.skip_bytes (length); - return 1; + return true; } void diff --git a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.cpp b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.cpp index 7ad4be97e15..d8ada0b832e 100644 --- a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.cpp +++ b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.cpp @@ -122,11 +122,11 @@ IBM1047_ISO8859::write_char_array (ACE_OutputCDR& out, buf[i] = (unsigned char)from_IBM1047[(unsigned char)buf[i]]; } - return 1; + return true; } this->good_bit(out, 0); - return 0; + return false; } // **************************************************************** diff --git a/TAO/utils/catior/Catior_i.cpp b/TAO/utils/catior/Catior_i.cpp index c0489e7329d..b41f6c75319 100644 --- a/TAO/utils/catior/Catior_i.cpp +++ b/TAO/utils/catior/Catior_i.cpp @@ -1036,7 +1036,7 @@ Catior_i::_find_info (CORBA::ULong id) void Catior_i::displayHex (TAO_InputCDR & str) { - if (str.good_bit () == 0) + if (!str.good_bit ()) return; TAO_InputCDR clone_str (str); @@ -1258,7 +1258,7 @@ Catior_i::cat_profile_helper (TAO_InputCDR& stream, // buffer, and skip the encapsulation. TAO_InputCDR str (stream, encap_len); - if (str.good_bit () == 0 || stream.skip_bytes (encap_len) == 0) + if (!str.good_bit () || stream.skip_bytes (encap_len) == 0) return false; static const size_t bufsize = 512; @@ -1346,7 +1346,7 @@ Catior_i::cat_coiop_profile (TAO_InputCDR& stream) // buffer, and skip the encapsulation. TAO_InputCDR str (stream, encap_len); - if (str.good_bit () == 0 || stream.skip_bytes (encap_len) == 0) + if (!str.good_bit () || stream.skip_bytes (encap_len) == 0) return false; static const size_t bufsize = 512; @@ -1436,7 +1436,7 @@ Catior_i::cat_uiop_profile (TAO_InputCDR& stream) // buffer, and skip the encapsulation. TAO_InputCDR str (stream, encap_len); - if (str.good_bit () == 0 || stream.skip_bytes (encap_len) == 0) + if (!str.good_bit () || stream.skip_bytes (encap_len) == 0) return false; static const size_t bufsize = 512; @@ -1517,7 +1517,7 @@ Catior_i::cat_sciop_profile (TAO_InputCDR& stream) // buffer, and skip the encapsulation. TAO_InputCDR str (stream, encap_len); - if (str.good_bit () == 0 || stream.skip_bytes (encap_len) == 0) + if (!str.good_bit () || stream.skip_bytes (encap_len) == 0) return false; static const size_t bufsize = 512; @@ -1623,7 +1623,7 @@ Catior_i::cat_nsk_profile_helper (TAO_InputCDR& stream, // buffer, and skip the encapsulation. TAO_InputCDR str (stream, encap_len); - if (str.good_bit () == 0 || stream.skip_bytes (encap_len) == 0) + if (!str.good_bit () || stream.skip_bytes (encap_len) == 0) return false; static const size_t bufsize = 512; -- cgit v1.2.1 From 01cb9ff254befab9c674e957a9e063b3c09bcc26 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 1 Feb 2023 10:56:12 +0100 Subject: Fix * ACE/ace/CDR_Stream.inl: --- ACE/ace/CDR_Stream.inl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ACE/ace/CDR_Stream.inl b/ACE/ace/CDR_Stream.inl index 4d68cdb8b08..cbfa8203fb6 100644 --- a/ACE/ace/CDR_Stream.inl +++ b/ACE/ace/CDR_Stream.inl @@ -1434,7 +1434,7 @@ operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_string x) } os.write_string (len, x.val_); - return (ACE_(os.good_bit () && (!x.bound_ || len <= x.bound_)); + return (os.good_bit () && (!x.bound_ || len <= x.bound_)); } ACE_INLINE ACE_CDR::Boolean -- cgit v1.2.1 From 9d3475584970e20117a7a99d3a75fecb521a0da9 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 1 Feb 2023 14:38:17 +0100 Subject: Further cleanup not used macros * ACE/ace/IOStream.h: * ACE/ace/OS_NS_Thread.cpp: * ACE/ace/OS_NS_Thread.inl: * ACE/ace/Profile_Timer.cpp: * ACE/ace/README: * ACE/ace/os_include/os_netdb.h: * ACE/ace/os_include/sys/os_loadavg.h: * ACE/ace/os_include/sys/os_pstat.h: --- ACE/ace/IOStream.h | 14 ------ ACE/ace/OS_NS_Thread.cpp | 10 ----- ACE/ace/OS_NS_Thread.inl | 7 --- ACE/ace/Profile_Timer.cpp | 4 -- ACE/ace/README | 86 +------------------------------------ ACE/ace/os_include/os_netdb.h | 31 ++++++------- ACE/ace/os_include/sys/os_loadavg.h | 4 -- ACE/ace/os_include/sys/os_pstat.h | 5 --- 8 files changed, 14 insertions(+), 147 deletions(-) diff --git a/ACE/ace/IOStream.h b/ACE/ace/IOStream.h index 38ebe090593..6acbb0687ad 100644 --- a/ACE/ace/IOStream.h +++ b/ACE/ace/IOStream.h @@ -373,19 +373,6 @@ typedef ostream& (*__omanip_)(ostream&); // These are necessary in case somebody wants to derive from us and // override one of these with a custom approach. -# if defined (ACE_LACKS_CHAR_RIGHT_SHIFTS) -#define GET_FUNC_SET0(MT,CODE,CODE2) \ - GET_PROT(MT,short &,CODE) \ - GET_PROT(MT,u_short &,CODE) \ - GET_PROT(MT,int &,CODE) \ - GET_PROT(MT,u_int &,CODE) \ - GET_PROT(MT,long &,CODE) \ - GET_PROT(MT,u_long &,CODE) \ - GET_PROT(MT,float &,CODE) \ - GET_PROT(MT,double &,CODE) \ - inline virtual MT& operator>>(__omanip_ func) CODE2 \ - inline virtual MT& operator>>(__manip_ func) CODE2 -# else #define GET_FUNC_SET0(MT,CODE,CODE2) \ GET_PROT(MT,short &,CODE) \ GET_PROT(MT,u_short &,CODE) \ @@ -401,7 +388,6 @@ typedef ostream& (*__omanip_)(ostream&); GET_PROT(MT,u_char *,CODE) \ inline virtual MT& operator>>(__omanip_ func) CODE2 \ inline virtual MT& operator>>(__manip_ func) CODE2 -# endif #define PUT_FUNC_SET0(MT,CODE,CODE2) \ PUT_PROT(MT,short,CODE) \ diff --git a/ACE/ace/OS_NS_Thread.cpp b/ACE/ace/OS_NS_Thread.cpp index d4e3c82b253..5114aab6be8 100644 --- a/ACE/ace/OS_NS_Thread.cpp +++ b/ACE/ace/OS_NS_Thread.cpp @@ -2552,16 +2552,6 @@ ACE_OS::event_init (ACE_event_t *event, if (type == USYNC_PROCESS) { const char *name_p = name; -# if defined (ACE_SHM_OPEN_REQUIRES_ONE_SLASH) - char adj_name[MAXPATHLEN]; - if (name[0] != '/') - { - adj_name[0] = '/'; - ACE_OS::strsncpy (&adj_name[1], name, MAXPATHLEN-1); - name_p = adj_name; - } -# endif /* ACE_SHM_OPEN_REQUIRES_ONE_SLASH */ - bool owner = false; // Let's see if the shared memory entity already exists. ACE_HANDLE fd = ACE_OS::shm_open (ACE_TEXT_CHAR_TO_TCHAR (name_p), diff --git a/ACE/ace/OS_NS_Thread.inl b/ACE/ace/OS_NS_Thread.inl index a33b50b076f..b962281ed7e 100644 --- a/ACE/ace/OS_NS_Thread.inl +++ b/ACE/ace/OS_NS_Thread.inl @@ -2095,10 +2095,6 @@ ACE_OS::sema_wait (ACE_sema_t *s, ACE_Time_Value &tv) if (expired) error = ETIME; - -# if defined (ACE_LACKS_COND_TIMEDWAIT_RESET) - tv = tv.now (); -# endif /* ACE_LACKS_COND_TIMEDWAIT_RESET */ } if (result != -2) @@ -2173,9 +2169,6 @@ ACE_OS::sema_wait (ACE_sema_t *s, ACE_Time_Value &tv) if (result == 0) { -# if defined (ACE_LACKS_COND_TIMEDWAIT_RESET) - tv = tv.now (); -# endif /* ACE_LACKS_COND_TIMEDWAIT_RESET */ --s->count_; } diff --git a/ACE/ace/Profile_Timer.cpp b/ACE/ace/Profile_Timer.cpp index 838e7860b8a..dbfe197d690 100644 --- a/ACE/ace/Profile_Timer.cpp +++ b/ACE/ace/Profile_Timer.cpp @@ -64,7 +64,6 @@ void ACE_Profile_Timer::elapsed_rusage (ACE_Profile_Timer::Rusage &usage) { ACE_TRACE ("ACE_Profile_Timer::elapsed_rusage"); -# if !defined (ACE_HAS_LIMITED_RUSAGE_T) // integral shared memory size usage.ru_ixrss = this->end_usage_.ru_ixrss - this->last_usage_.ru_ixrss; @@ -110,9 +109,6 @@ ACE_Profile_Timer::elapsed_rusage (ACE_Profile_Timer::Rusage &usage) this->subtract (usage.ru_stime, this->end_usage_.ru_stime, this->last_usage_.ru_stime); -# else - ACE_UNUSED_ARG(usage); -# endif /* ACE_HAS_LIMITED_RUSAGE_T */ } void diff --git a/ACE/ace/README b/ACE/ace/README index 99d94841674..4111fd9d38c 100644 --- a/ACE/ace/README +++ b/ACE/ace/README @@ -175,10 +175,6 @@ ACE_SCANDIR_CMP_USES_VOIDPTR The OS's scandir() comparator function ACE_SCANDIR_CMP_USES_CONST_VOIDPTR The OS's scandir() comparator function is int (*compare)(const void*, const void*). -ACE_HAS_STDARG_THR_DEST Platform has void (*)(...) - prototype for - pthread_key_create() - destructor (e.g., LynxOS). ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS Platform/compiler supports Win32 structural exceptions ACE_HAS_4_4BSD_SENDMSG_RECVMSG Platform has BSD 4.4 @@ -197,20 +193,6 @@ ACE_HAS_BIG_FD_SET Compiler/platform has typedef ACE_HAS_BROKEN_ACCEPT_ADDR Platform can't correctly deal with a NULL addr to accept() (e.g, VxWorks < 6.9). -ACE_HAS_BROKEN_DGRAM_SENDV Platform sendv() does not work - properly with datagrams, - i.e. it fails when the iovec - size is IOV_MAX. -ACE_HAS_BROKEN_MAP_FAILED Platform doesn't cast MAP_FAILED - to a void *. -ACE_HAS_BROKEN_MSG_H Platform headers don't support - prototypes -ACE_HAS_BROKEN_MMAP_H HP/UX does not wrap the - mmap(2) header files with - extern "C". -ACE_HAS_BROKEN_NESTED_TEMPLATES MSVC has trouble with defining - STL containers for nested - structs and classes ACE_HAS_BYTESEX_H Platform has . ACE_HAS_CANCEL_IO Platform supports the Win32 CancelIO() function (WinNT 4.0 @@ -286,8 +268,6 @@ ACE_HAS_NONSTATIC_OBJECT_MANAGER Causes the ACE_Object_Manager a static (global) instance. ACE_HAS_THR_KEYDELETE Platform supports thr_keydelete (e.g,. UNIXWARE) -ACE_HAS_LIMITED_RUSAGE_T The rusage_t structure has - only two fields. ACE_HAS_LINUX_NPTL Linux platform (with kernel >= 2.6.x) with GLibc including new NPTL (Native POSIX Thread Library). @@ -427,7 +407,7 @@ ACE_HAS_SIGINFO_T Platform supports SVR4 extended signals ACE_HAS_SIGSUSPEND Platform supports sigsuspend() ACE_HAS_SIGISMEMBER_BUG Platform has bug with - sigismember() (HP/UX 11). + sigismember() ACE_HAS_SIGNAL_OBJECT_AND_WAIT Platform supports the Win32 SignalObjectAndWait() function (WinNT 4.0 and beyond). @@ -465,39 +445,21 @@ ACE_HAS_STRNLEN Platform supports strnlen(3). ACE_HAS_STREAMS Platform supports STREAMS ACE_HAS_STREAM_PIPES Platform supports STREAM pipes ACE_HAS_STRICT Use the STRICT compilation mode on Win32. -ACE_HAS_STRUCT_NETDB_DATA Compiler/platform has strange - hostent API for socket *_r() - calls ACE_HAS_SVR4_DYNAMIC_LINKING Compiler/platform supports SVR4 dynamic linking semantics ACE_HAS_SVR4_GETTIMEOFDAY Compiler/platform supports SVR4 gettimeofday() prototype ACE_HAS_SVR4_SIGNAL_T Compiler/platform supports SVR4 signal typedef -ACE_HAS_SYSCALL_GETRUSAGE HP/UX has an undefined syscall - for GETRUSAGE... -ACE_HAS_SYSENT_H Platform provides - header ACE_HAS_SYSV_IPC Platform supports System V IPC (most versions of UNIX, but not Win32) ACE_HAS_SYS_FILIO_H Platform provides header -ACE_HAS_SYS_LOADAVG_H Compiler/platform contains the - file. -ACE_HAS_SYS_PSTAT_H Compiler/platform contains the - file. ACE_HAS_SYS_SOCKIO_H Compiler/platform provides the sockio.h file ACE_HAS_SYS_SYSCALL_H Compiler/platform contains the file. -ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA Compiler's template - instantiation mechanism - supports the use of "#pragma - instantiate". Edison Design - Group compilers, e.g., SGI C++ - and Green Hills 1.8.8 and - later, support this. ACE_HAS_TEMPLATE_TYPEDEFS Compiler implements templates that support typedefs inside of classes used as formal @@ -547,9 +509,6 @@ ACE_HAS_UALARM Platform supports ualarm() ACE_HAS_UCONTEXT_T Platform supports ucontext_t (which is used in the extended signal API). -ACE_HAS_UNION_WAIT The wait() system call takes a - (union wait *) rather than int - * ACE_HAS_VALGRIND Running with valgrind ACE_HAS_VERBOSE_NOTSUP Prints out console message in ACE_NOTSUP. Useful for @@ -653,9 +612,6 @@ ACE_LACKS_OPENDIR Platform lacks opendir and the opendir emulation must be used ACE_LACKS_READDIR Platform lacks readdir and the readdir emulation must be used -ACE_LACKS_COND_TIMEDWAIT_RESET pthread_cond_timedwait does - *not* reset the time argument - when the lock is acquired. ACE_LACKS_CONST_TIMESPEC_PTR Platform forgot const in cond_timewait (e.g., HP/UX). ACE_LACKS_COND_T Platform lacks condition @@ -731,8 +687,6 @@ ACE_LACKS_NETDB_REENTRANT_FUNCTIONS Platform does not support getservbyname_r). ACE_LACKS_NEW_H OS doesn't have, or we don't want to use, new.h. -ACE_LACKS_NULL_PTHREAD_STATUS OS requires non-null status pointer - for ::pthread_join (). ACE_LACKS_PERFECT_MULTICAST_FILTERING Platform lacks IGMPv3 "perfect" filtering of multicast dgrams at the socket level. If == 1, ACE_SOCK_Dgram_Mcast will bind @@ -751,8 +705,6 @@ ACE_LACKS_PTHREAD_THR_SIGSETMASK Platform lacks ACE_LACKS_PUTENV_PROTOTYPE Platform/compiler lacks the putenv() prototype (e.g., LynxOS) -ACE_LACKS_PWD_REENTRANT_FUNCTIONS Platform lacks getpwnam_r() - methods (e.g., SGI 6.2). ACE_LACKS_QSORT Compiler/platform lacks the standard C library qsort() function @@ -842,12 +794,6 @@ ACE_LACKS_TIMESPEC_T Platform does not define struct timespec. ACE_LACKS_TRUNCATE Platform doesn't have truncate() (e.g., vxworks) -ACE_LACKS_CHAR_RIGHT_SHIFTS Compiler does not have any istream - operator>> for chars, u_chars, or - signed chars. -ACE_LACKS_CHAR_STAR_RIGHT_SHIFTS Compiler does not have - operator>> (istream &, u_char *) or - operator>> (istream &, signed char *) ACE_LACKS_UCONTEXT_H Platform lacks the ucontext.h file ACE_LACKS_UMASK Platform lacks umask function @@ -859,9 +805,6 @@ ACE_LACKS_UNIX_DOMAIN_SOCKETS ACE platform has no UNIX domain sockets ACE_LACKS_UNIX_SIGNALS Platform lacks full signal support (e.g., Win32). -ACE_LACKS_UNSIGNEDLONGLONG_T Compiler/platform does not - support the unsigned long - long datatype. ACE_LACKS_UTSNAME_T Platform lacks struct utsname (e.g., Win32 and VxWorks) ACE_LACKS_UNAME Platform lacks uname calls @@ -887,10 +830,6 @@ ACE_NO_WIN32_LEAN_AND_MEAN If this is set, then ACE does not code that uses non-lean Win32 facilities such as COM. -ACE_SHM_OPEN_REQUIRES_ONE_SLASH The path specified on shm_open() must - have a leading, single slash and not - have any other slashes. - ACE_WSTRING_HAS_USHORT_SUPPORT If a platform has wchar_t as a separate type, then ACE_WString doesn't have a @@ -1187,16 +1126,6 @@ ACE_HAS_POLL: #include /**/ #endif /* ACE_HAS_POLL */ -ACE_USE_POLL_IMPLEMENTATION: ------------------- - - Used in: - ace/OS.h - - Notes: - Use the poll() event demultiplexor rather than select(). - - ACE_HAS_SVR4_SIGNAL_T: ---------------------- @@ -1291,19 +1220,6 @@ ACE_HAS_TIUSER_H: in conjunction with t_bind, t_accept, etc.. transport layer. -ACE_USE_POLL_IMPLEMENTATION: ----------------------------- - - Used in: - libsrc/Reactor/Reactor.i - include/Event_Handler.h - ace/OS.h - include/Reactor.h - - Notes: - in the reactor, use poll instead of select. In general, - good thing to have set. - ACE_USES_GPROF: ---------------------------- Used in: diff --git a/ACE/ace/os_include/os_netdb.h b/ACE/ace/os_include/os_netdb.h index de509b4cbc7..189f29b9dbb 100644 --- a/ACE/ace/os_include/os_netdb.h +++ b/ACE/ace/os_include/os_netdb.h @@ -127,24 +127,19 @@ struct servent { # define EAI_OVERFLOW -12 /* Error result from getaddrinfo(): buffer overflow */ #endif -#if defined (ACE_HAS_STRUCT_NETDB_DATA) - typedef char ACE_HOSTENT_DATA[sizeof(struct hostent_data)]; - typedef char ACE_SERVENT_DATA[sizeof(struct servent_data)]; - typedef char ACE_PROTOENT_DATA[sizeof(struct protoent_data)]; -#else -# if !defined ACE_HOSTENT_DATA_SIZE -# define ACE_HOSTENT_DATA_SIZE (4*1024) -# endif /*ACE_HOSTENT_DATA_SIZE */ -# if !defined ACE_SERVENT_DATA_SIZE -# define ACE_SERVENT_DATA_SIZE (4*1024) -# endif /*ACE_SERVENT_DATA_SIZE */ -# if !defined ACE_PROTOENT_DATA_SIZE -# define ACE_PROTOENT_DATA_SIZE (2*1024) -# endif /*ACE_PROTOENT_DATA_SIZE */ - typedef char ACE_HOSTENT_DATA[ACE_HOSTENT_DATA_SIZE]; - typedef char ACE_SERVENT_DATA[ACE_SERVENT_DATA_SIZE]; - typedef char ACE_PROTOENT_DATA[ACE_PROTOENT_DATA_SIZE]; -#endif /* ACE_HAS_STRUCT_NETDB_DATA */ +#if !defined ACE_HOSTENT_DATA_SIZE +# define ACE_HOSTENT_DATA_SIZE (4*1024) +#endif /*ACE_HOSTENT_DATA_SIZE */ +#if !defined ACE_SERVENT_DATA_SIZE +# define ACE_SERVENT_DATA_SIZE (4*1024) +#endif /*ACE_SERVENT_DATA_SIZE */ +#if !defined ACE_PROTOENT_DATA_SIZE +# define ACE_PROTOENT_DATA_SIZE (2*1024) +#endif /*ACE_PROTOENT_DATA_SIZE */ + +typedef char ACE_HOSTENT_DATA[ACE_HOSTENT_DATA_SIZE]; +typedef char ACE_SERVENT_DATA[ACE_SERVENT_DATA_SIZE]; +typedef char ACE_PROTOENT_DATA[ACE_PROTOENT_DATA_SIZE]; # if !defined(MAXHOSTNAMELEN) # define MAXHOSTNAMELEN HOST_NAME_MAX diff --git a/ACE/ace/os_include/sys/os_loadavg.h b/ACE/ace/os_include/sys/os_loadavg.h index 6437d7d9235..fba115f979e 100644 --- a/ACE/ace/os_include/sys/os_loadavg.h +++ b/ACE/ace/os_include/sys/os_loadavg.h @@ -21,9 +21,5 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (ACE_HAS_SYS_LOADAVG_H) -# include /**/ -#endif /* ACE_HAS_SYS_LOADAVG_H */ - #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_SYS_OS_LOADAVG_H */ diff --git a/ACE/ace/os_include/sys/os_pstat.h b/ACE/ace/os_include/sys/os_pstat.h index 377e83b2e1c..1774c39970d 100644 --- a/ACE/ace/os_include/sys/os_pstat.h +++ b/ACE/ace/os_include/sys/os_pstat.h @@ -21,10 +21,5 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (ACE_HAS_SYS_PSTAT_H) -# include /**/ -# include /**/ -#endif /* ACE_HAS_SYS_PSTAT_H */ - #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_SYS_OS_PSTAT_H */ -- cgit v1.2.1 From 281078a59a44ca971675b90616f5e35a998bf077 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 1 Feb 2023 14:41:51 +0100 Subject: Removed os_include headers which don't include any file anymore --- ACE/ace/os_include/sys/os_loadavg.h | 25 ------------------------- ACE/ace/os_include/sys/os_pstat.h | 25 ------------------------- 2 files changed, 50 deletions(-) delete mode 100644 ACE/ace/os_include/sys/os_loadavg.h delete mode 100644 ACE/ace/os_include/sys/os_pstat.h diff --git a/ACE/ace/os_include/sys/os_loadavg.h b/ACE/ace/os_include/sys/os_loadavg.h deleted file mode 100644 index fba115f979e..00000000000 --- a/ACE/ace/os_include/sys/os_loadavg.h +++ /dev/null @@ -1,25 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file os_loadavg.h - * - * loadavg functions - * - * @author Johnny Willemsen - */ -//============================================================================= - -#ifndef ACE_OS_INCLUDE_SYS_OS_LOADAVG_H -#define ACE_OS_INCLUDE_SYS_OS_LOADAVG_H - -#include /**/ "ace/pre.h" - -#include /**/ "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "ace/post.h" -#endif /* ACE_OS_INCLUDE_SYS_OS_LOADAVG_H */ diff --git a/ACE/ace/os_include/sys/os_pstat.h b/ACE/ace/os_include/sys/os_pstat.h deleted file mode 100644 index 1774c39970d..00000000000 --- a/ACE/ace/os_include/sys/os_pstat.h +++ /dev/null @@ -1,25 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file os_pstat.h - * - * pstat functions - * - * @author Johnny Willemsen - */ -//============================================================================= - -#ifndef ACE_OS_INCLUDE_SYS_OS_PSTAT_H -#define ACE_OS_INCLUDE_SYS_OS_PSTAT_H - -#include /**/ "ace/pre.h" - -#include /**/ "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "ace/post.h" -#endif /* ACE_OS_INCLUDE_SYS_OS_PSTAT_H */ -- cgit v1.2.1 From 1eb5c6564e45cce7980f6bbac7b4b073b806788c Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 1 Feb 2023 14:48:42 +0100 Subject: Removed include * ACE/ace/OS_NS_unistd.cpp: --- ACE/ace/OS_NS_unistd.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/ACE/ace/OS_NS_unistd.cpp b/ACE/ace/OS_NS_unistd.cpp index 49b5736f970..be45618f36c 100644 --- a/ACE/ace/OS_NS_unistd.cpp +++ b/ACE/ace/OS_NS_unistd.cpp @@ -11,7 +11,6 @@ #include "ace/OS_Memory.h" #include "ace/OS_NS_Thread.h" #include "ace/Object_Manager_Base.h" -#include "ace/os_include/sys/os_pstat.h" #if defined (ACE_HAS_SYSCTL) # include "ace/os_include/sys/os_sysctl.h" #endif /* ACE_HAS_SYSCTL */ -- cgit v1.2.1 From 6198126ce20cc418252f461621c81d19ee2b36e4 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 1 Feb 2023 15:44:33 +0100 Subject: Removed pharlap support --- ACE/NEWS | 2 +- ACE/ace/ACE.cpp | 7 +- ACE/ace/Configuration.cpp | 4 +- ACE/ace/Configuration.h | 4 +- ACE/ace/Lib_Find.cpp | 4 +- ACE/ace/Log_Msg.cpp | 12 +-- ACE/ace/Msg_WFMO_Reactor.cpp | 4 +- ACE/ace/Msg_WFMO_Reactor.h | 4 +- ACE/ace/Msg_WFMO_Reactor.inl | 4 +- ACE/ace/NT_Service.cpp | 4 +- ACE/ace/NT_Service.h | 4 +- ACE/ace/OS_NS_Thread.cpp | 29 +------ ACE/ace/OS_NS_Thread.inl | 11 --- ACE/ace/OS_NS_dlfcn.inl | 8 -- ACE/ace/OS_NS_netdb.cpp | 34 --------- ACE/ace/OS_NS_stdio.inl | 21 +---- ACE/ace/OS_NS_sys_mman.inl | 17 ++--- ACE/ace/OS_NS_sys_socket.inl | 7 -- ACE/ace/OS_NS_sys_utsname.cpp | 14 ---- ACE/ace/OS_NS_unistd.cpp | 8 +- ACE/ace/OS_NS_unistd.inl | 56 +------------- ACE/ace/Pagefile_Memory_Pool.cpp | 10 +-- ACE/ace/Pagefile_Memory_Pool.h | 4 +- ACE/ace/Pagefile_Memory_Pool.inl | 4 +- ACE/ace/README | 8 -- ACE/ace/Recursive_Thread_Mutex.cpp | 4 +- ACE/ace/Registry.cpp | 4 +- ACE/ace/Registry.h | 5 +- ACE/ace/SPIPE_Connector.cpp | 6 +- ACE/ace/Sock_Connect.cpp | 87 +-------------------- ACE/ace/WFMO_Reactor.cpp | 25 ------ ACE/ace/config-macros.h | 2 +- ACE/ace/config-pharlap.h | 89 ---------------------- ACE/ace/config-win32-common.h | 21 ++--- ACE/ace/os_include/netinet/os_in.h | 6 +- ACE/apps/gperf/src/Options.h | 6 -- .../tests/HTBP/Reactor_Tests/test_config.h | 16 +--- ACE/tests/Conn_Test.cpp | 8 -- ACE/tests/Log_Msg_Test.cpp | 2 +- ACE/tests/Test_Output.cpp | 12 +-- ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp | 2 +- ACE/tests/Thread_Pool_Reactor_Test.cpp | 2 +- ACE/tests/test_config.h | 5 -- TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp | 11 +-- .../tests/HTIOP/BiDirectional/Test_Output.cpp | 11 +-- TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp | 11 +-- TAO/orbsvcs/tests/HTIOP/test_config.h | 5 -- TAO/tao/Strategies/advanced_resource.cpp | 4 +- 48 files changed, 73 insertions(+), 555 deletions(-) delete mode 100644 ACE/ace/config-pharlap.h diff --git a/ACE/NEWS b/ACE/NEWS index 42f1f292f2a..991e25e40b5 100644 --- a/ACE/NEWS +++ b/ACE/NEWS @@ -2,7 +2,7 @@ USER VISIBLE CHANGES BETWEEN ACE-7.0.11 and ACE-7.1.0 ===================================================== . Removed support for Windows CE, OpenVMS, HPUX, AIX, RTEMS, - and Solaris + Pharlap, and Solaris USER VISIBLE CHANGES BETWEEN ACE-7.0.10 and ACE-7.0.11 ====================================================== diff --git a/ACE/ace/ACE.cpp b/ACE/ace/ACE.cpp index 06b0289b89a..88e75e8a9e4 100644 --- a/ACE/ace/ACE.cpp +++ b/ACE/ace/ACE.cpp @@ -215,10 +215,7 @@ ACE::select (int width, int ACE::terminate_process (pid_t pid) { -#if defined (ACE_HAS_PHARLAP) - ACE_UNUSED_ARG (pid); - ACE_NOTSUP_RETURN (-1); -#elif defined (ACE_WIN32) +#if defined (ACE_WIN32) // Create a handle for the given process id. ACE_HANDLE process_handle = ::OpenProcess (PROCESS_TERMINATE, @@ -239,7 +236,7 @@ ACE::terminate_process (pid_t pid) } #else return ACE_OS::kill (pid, 9); -#endif /* ACE_HAS_PHARLAP */ +#endif /* ACE_WIN32 */ } int diff --git a/ACE/ace/Configuration.cpp b/ACE/ace/Configuration.cpp index 56cb81fd8ea..a902e263c4a 100644 --- a/ACE/ace/Configuration.cpp +++ b/ACE/ace/Configuration.cpp @@ -401,7 +401,7 @@ ACE_Configuration::operator!= (const ACE_Configuration& rhs) const ////////////////////////////////////////////////////////////////////////////// -#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY) +#if defined (ACE_WIN32) static constexpr int ACE_DEFAULT_BUFSIZE = 256; @@ -1020,7 +1020,7 @@ ACE_Configuration_Win32Registry::resolve_key (HKEY hKey, return result; } -#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_REGISTRY */ +#endif /* ACE_WIN32 */ /////////////////////////////////////////////////////////////// diff --git a/ACE/ace/Configuration.h b/ACE/ace/Configuration.h index b9cb18204d9..436ee3bf0ad 100644 --- a/ACE/ace/Configuration.h +++ b/ACE/ace/Configuration.h @@ -407,7 +407,7 @@ protected: ACE_Configuration_Section_Key root_; }; -#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY) +#if defined (ACE_WIN32) /** * @class ACE_Section_Key_Win32 @@ -534,7 +534,7 @@ protected: const u_long security_access_; }; -#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_REGISTRY */ +#endif /* ACE_WIN32 */ // ACE_Allocator version diff --git a/ACE/ace/Lib_Find.cpp b/ACE/ace/Lib_Find.cpp index 085ed0b938e..ca7decd224b 100644 --- a/ACE/ace/Lib_Find.cpp +++ b/ACE/ace/Lib_Find.cpp @@ -25,14 +25,14 @@ ACE::ldfind (const ACE_TCHAR* filename, { ACE_TRACE ("ACE::ldfind"); -#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) +#if defined (ACE_WIN32) ACE_TCHAR expanded_filename[MAXPATHLEN]; if (ACE_TEXT_ExpandEnvironmentStrings (filename, expanded_filename, sizeof expanded_filename / sizeof (ACE_TCHAR))) filename = expanded_filename; -#endif /* ACE_WIN32 && !ACE_HAS_PHARLAP */ +#endif /* ACE_WIN32 */ ACE_TCHAR tempcopy[MAXPATHLEN + 1]; ACE_TCHAR searchpathname[MAXPATHLEN + 1]; diff --git a/ACE/ace/Log_Msg.cpp b/ACE/ace/Log_Msg.cpp index dd7e904b36e..570711e99dc 100644 --- a/ACE/ace/Log_Msg.cpp +++ b/ACE/ace/Log_Msg.cpp @@ -80,7 +80,7 @@ public: }; #endif /* ACE_MT_SAFE */ -#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) +#if defined (ACE_WIN32) # define ACE_LOG_MSG_SYSLOG_BACKEND ACE_Log_Msg_NT_Event_Log #elif defined (ACE_ANDROID) # define ACE_LOG_MSG_SYSLOG_BACKEND ACE_Log_Msg_Android_Logcat @@ -1313,10 +1313,6 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, { errno = ACE::map_errno (this->errnum ()); ACE_TCHAR *lpMsgBuf = 0; - - // PharLap can't do FormatMessage, so try for socket - // error. -# if !defined (ACE_HAS_PHARLAP) ACE_TEXT_FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_MAX_WIDTH_MASK | FORMAT_MESSAGE_FROM_SYSTEM, @@ -1328,7 +1324,6 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, (ACE_TCHAR *) &lpMsgBuf, 0, 0); -# endif /* ACE_HAS_PHARLAP */ // If we don't get a valid response from // , we'll assume this is a @@ -1521,10 +1516,6 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, { errno = ACE::map_errno (this->errnum ()); ACE_TCHAR *lpMsgBuf = 0; - - // PharLap can't do FormatMessage, so try for socket - // error. -# if !defined (ACE_HAS_PHARLAP) ACE_TEXT_FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_MAX_WIDTH_MASK | FORMAT_MESSAGE_FROM_SYSTEM, @@ -1536,7 +1527,6 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, (ACE_TCHAR *) &lpMsgBuf, 0, 0); -# endif /* ACE_HAS_PHARLAP */ // If we don't get a valid response from // , we'll assume this is a diff --git a/ACE/ace/Msg_WFMO_Reactor.cpp b/ACE/ace/Msg_WFMO_Reactor.cpp index 57682de44f3..af05fb8929c 100644 --- a/ACE/ace/Msg_WFMO_Reactor.cpp +++ b/ACE/ace/Msg_WFMO_Reactor.cpp @@ -1,6 +1,6 @@ #include "ace/Msg_WFMO_Reactor.h" -#if defined (ACE_WIN32) && !defined (ACE_LACKS_MSG_WFMO) +#if defined (ACE_WIN32) #if !defined (__ACE_INLINE__) #include "ace/Msg_WFMO_Reactor.inl" @@ -78,4 +78,4 @@ ACE_Msg_WFMO_Reactor::poll_remaining_handles (DWORD slot) ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* ACE_WIN32 && !ACE_LACKS_MSG_WFMO */ +#endif /* ACE_WIN32 */ diff --git a/ACE/ace/Msg_WFMO_Reactor.h b/ACE/ace/Msg_WFMO_Reactor.h index 3381da09d5d..835edb59513 100644 --- a/ACE/ace/Msg_WFMO_Reactor.h +++ b/ACE/ace/Msg_WFMO_Reactor.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (ACE_WIN32) && !defined (ACE_LACKS_MSG_WFMO) +#if defined (ACE_WIN32) #include "ace/WFMO_Reactor.h" @@ -111,7 +111,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Msg_WFMO_Reactor.inl" #endif /* __ACE_INLINE__ */ -#endif /* ACE_WIN32 && !ACE_LACKS_MSG_WFMO */ +#endif /* ACE_WIN32 */ #include /**/ "ace/post.h" #endif /* ACE_MSG_WFMO_REACTOR_H */ diff --git a/ACE/ace/Msg_WFMO_Reactor.inl b/ACE/ace/Msg_WFMO_Reactor.inl index ee73e611812..cf6a280996c 100644 --- a/ACE/ace/Msg_WFMO_Reactor.inl +++ b/ACE/ace/Msg_WFMO_Reactor.inl @@ -1,5 +1,5 @@ // -*- C++ -*- -#if defined (ACE_WIN32) && !defined (ACE_LACKS_MSG_WFMO) +#if defined (ACE_WIN32) ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -29,4 +29,4 @@ ACE_Msg_WFMO_Reactor::alertable_handle_events (ACE_Time_Value *how_long) ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* ACE_WIN32 && !ACE_LACKS_MSG_WFMO */ +#endif /* ACE_WIN32 */ diff --git a/ACE/ace/NT_Service.cpp b/ACE/ace/NT_Service.cpp index cdc6ecc5bc8..66c8432ce10 100644 --- a/ACE/ace/NT_Service.cpp +++ b/ACE/ace/NT_Service.cpp @@ -1,5 +1,5 @@ #include "ace/config-all.h" -#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES) +#if defined (ACE_WIN32) #include "ace/NT_Service.h" @@ -610,4 +610,4 @@ ACE_NT_Service::wait_for_service_state (DWORD desired_state, ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */ +#endif /* ACE_WIN32 */ diff --git a/ACE/ace/NT_Service.h b/ACE/ace/NT_Service.h index 5c9f282884f..f931d0fbd55 100644 --- a/ACE/ace/NT_Service.h +++ b/ACE/ace/NT_Service.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES) +#if defined (ACE_WIN32) #include "ace/ACE.h" #include "ace/OS_Log_Msg_Attributes.h" @@ -429,7 +429,7 @@ extern VOID WINAPI ace_nt_svc_main_##SVCNAME (DWORD dwArgc, \ #include "ace/NT_Service.inl" #endif /* __ACE_INLINE__ */ -#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */ +#endif /* ACE_WIN32 */ #include /**/ "ace/post.h" diff --git a/ACE/ace/OS_NS_Thread.cpp b/ACE/ace/OS_NS_Thread.cpp index d4e3c82b253..e3e9532c5b3 100644 --- a/ACE/ace/OS_NS_Thread.cpp +++ b/ACE/ace/OS_NS_Thread.cpp @@ -3176,34 +3176,12 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params, } #elif defined (ACE_WIN32) - // PharLap ETS can act on the current thread - it can set the - // quantum also, unlike Win32. All this only works on the RT - // version. -# if defined (ACE_HAS_PHARLAP_RT) - if (id != ACE_SELF) - ACE_NOTSUP_RETURN (-1); - -# if !defined (ACE_PHARLAP_LABVIEW_RT) - if (sched_params.quantum() != ACE_Time_Value::zero) - EtsSetTimeSlice (sched_params.quantum().msec()); -# endif -# else - if (sched_params.quantum () != ACE_Time_Value::zero) - { - // I don't know of a way to set the quantum on Win32. - errno = EINVAL; - return -1; - } -# endif /* ACE_HAS_PHARLAP_RT */ - if (sched_params.scope () == ACE_SCOPE_THREAD) { // Setting the REALTIME_PRIORITY_CLASS on Windows is almost always // a VERY BAD THING. This include guard will allow people // to easily disable this feature in ACE. - // It won't work at all for Pharlap since there's no SetPriorityClass. -#if !defined (ACE_HAS_PHARLAP) && \ - !defined (ACE_DISABLE_WIN32_INCREASE_PRIORITY) +#if !defined (ACE_DISABLE_WIN32_INCREASE_PRIORITY) // Set the priority class of this process to the REALTIME process class // _if_ the policy is ACE_SCHED_FIFO. Otherwise, set to NORMAL. if (!::SetPriorityClass (::GetCurrentProcess (), @@ -3223,9 +3201,6 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params, } else if (sched_params.scope () == ACE_SCOPE_PROCESS) { -# if defined (ACE_HAS_PHARLAP_RT) - ACE_NOTSUP_RETURN (-1); -# else HANDLE hProcess = ::OpenProcess (PROCESS_SET_INFORMATION, FALSE, @@ -3253,8 +3228,6 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params, } ::CloseHandle (hProcess); return 0; -#endif /* ACE_HAS_PHARLAP_RT */ - } else { diff --git a/ACE/ace/OS_NS_Thread.inl b/ACE/ace/OS_NS_Thread.inl index a33b50b076f..45520ab7e46 100644 --- a/ACE/ace/OS_NS_Thread.inl +++ b/ACE/ace/OS_NS_Thread.inl @@ -2495,22 +2495,11 @@ ACE_OS::thr_getprio (ACE_hthread_t ht_id, int &priority, int &policy) # elif defined (ACE_HAS_WTHREADS) ACE_Errno_Guard error (errno); priority = ::GetThreadPriority (ht_id); - -# if defined (ACE_HAS_PHARLAP) -# if defined (ACE_PHARLAP_LABVIEW_RT) - policy = ACE_SCHED_FIFO; -# else - DWORD timeslice = ::EtsGetTimeSlice (); - policy = timeslice == 0 ? ACE_SCHED_OTHER : ACE_SCHED_FIFO; -# endif /* ACE_PHARLAP_LABVIEW_RT */ -# else DWORD const priority_class = ::GetPriorityClass (::GetCurrentProcess ()); if (priority_class == 0 && (error = ::GetLastError ()) != NO_ERROR) ACE_FAIL_RETURN (-1); policy = (priority_class == REALTIME_PRIORITY_CLASS) ? ACE_SCHED_FIFO : ACE_SCHED_OTHER; -# endif /* ACE_HAS_PHARLAP */ - return 0; # elif defined (ACE_HAS_VXTHREADS) return ::taskPriorityGet (ht_id, &priority); diff --git a/ACE/ace/OS_NS_dlfcn.inl b/ACE/ace/OS_NS_dlfcn.inl index b9928e2936a..058f4cb2ba9 100644 --- a/ACE/ace/OS_NS_dlfcn.inl +++ b/ACE/ace/OS_NS_dlfcn.inl @@ -8,10 +8,6 @@ #include "ace/os_include/os_fcntl.h" #include "ace/os_include/os_string.h" -#if defined (ACE_WIN32) && defined (ACE_HAS_PHARLAP) -# include "ace/OS_NS_stdio.h" -#endif - #if defined (ACE_USES_ASM_SYMBOL_IN_DLSYM) # include "ace/OS_Memory.h" # include "ace/OS_NS_string.h" @@ -69,9 +65,6 @@ ACE_OS::dlerror () //FUZZ: enable check_for_lack_ACE_OS # elif defined (ACE_WIN32) static ACE_TCHAR buf[128]; -# if defined (ACE_HAS_PHARLAP) - ACE_OS::sprintf (buf, "error code %d", GetLastError()); -# else ACE_TEXT_FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM, 0, ::GetLastError (), @@ -79,7 +72,6 @@ ACE_OS::dlerror () buf, sizeof buf / sizeof buf[0], 0); -# endif /* ACE_HAS_PHARLAP */ return buf; # else ACE_NOTSUP_RETURN (0); diff --git a/ACE/ace/OS_NS_netdb.cpp b/ACE/ace/OS_NS_netdb.cpp index 6ede9036026..49f658e5c5e 100644 --- a/ACE/ace/OS_NS_netdb.cpp +++ b/ACE/ace/OS_NS_netdb.cpp @@ -5,10 +5,6 @@ # include "ace/OS_NS_netdb.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ -#if defined (ACE_WIN32) && defined (ACE_HAS_PHARLAP) -# include "ace/OS_NS_stdio.h" -#endif - #include "ace/os_include/net/os_if.h" #include "ace/Global_Macros.h" #include "ace/OS_NS_arpa_inet.h" @@ -44,7 +40,6 @@ ACE_OS::getmacaddress (struct macaddr_node_t *node) ACE_OS_TRACE ("ACE_OS::getmacaddress"); #if defined (ACE_WIN32) -# if !defined (ACE_HAS_PHARLAP) /** Define a structure for use with the netbios routine */ struct ADAPTERSTAT { @@ -96,35 +91,6 @@ ACE_OS::getmacaddress (struct macaddr_node_t *node) } } return 0; -# else -# if defined (ACE_HAS_PHARLAP_RT) - DEVHANDLE ip_dev = (DEVHANDLE)0; - EK_TCPIPCFG *devp = 0; - size_t i; - ACE_TCHAR dev_name[16]; - - for (i = 0; i < 10; i++) - { - // Ethernet. - ACE_OS::snprintf (dev_name, 16, "ether%d", i); - ip_dev = EtsTCPGetDeviceHandle (dev_name); - if (ip_dev != 0) - break; - } - if (ip_dev == 0) - return -1; - devp = EtsTCPGetDeviceCfg (ip_dev); - if (devp == 0) - return -1; - ACE_OS::memcpy (node->node, - &devp->EthernetAddress[0], - 6); - return 0; -# else - ACE_UNUSED_ARG (node); - ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_PHARLAP_RT */ -# endif /* ACE_HAS_PHARLAP */ #elif defined (ACE_LINUX) && !defined (ACE_LACKS_NETWORKING) // It's easiest to know the first MAC-using interface. Use the BSD diff --git a/ACE/ace/OS_NS_stdio.inl b/ACE/ace/OS_NS_stdio.inl index 6066165912e..f3268c7ac1d 100644 --- a/ACE/ace/OS_NS_stdio.inl +++ b/ACE/ace/OS_NS_stdio.inl @@ -39,7 +39,6 @@ ACE_OS::flock_adjust_params (ACE_OS::ace_flock_t *lock, case SEEK_CUR: { LARGE_INTEGER offset; -# if !defined (ACE_LACKS_WIN32_SETFILEPOINTEREX) LARGE_INTEGER distance; distance.QuadPart = 0; if (!::SetFilePointerEx (lock->handle_, @@ -50,18 +49,6 @@ ACE_OS::flock_adjust_params (ACE_OS::ace_flock_t *lock, ACE_OS::set_errno_to_last_error (); return; } -# else - offset.LowPart = ::SetFilePointer (lock->handle_, - 0, - &offset.HighPart, - FILE_CURRENT); - if (offset.LowPart == INVALID_SET_FILE_POINTER && - ::GetLastError() != NO_ERROR) - { - ACE_OS::set_errno_to_last_error (); - return; - } -# endif /* ACE_LACKS_WIN32_SETFILEPOINTEREX */ # if defined (_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 start += offset.QuadPart; @@ -364,10 +351,6 @@ ACE_OS::cuserid (char *user, size_t maxlen) ::remCurIdGet (user, 0); return user; } -#elif defined (ACE_HAS_PHARLAP) - ACE_UNUSED_ARG (user); - ACE_UNUSED_ARG (maxlen); - ACE_NOTSUP_RETURN (0); #elif defined (ACE_WIN32) BOOL const result = GetUserNameA (user, (u_long *) &maxlen); if (result == FALSE) @@ -841,7 +824,7 @@ ACE_OS::rename (const char *old_name, ACE_UNUSED_ARG (new_name); ACE_UNUSED_ARG (flags); ACE_NOTSUP_RETURN (-1); -# elif defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_MOVEFILEEX) +# elif defined (ACE_WIN32) // NT4 (and up) provides a way to rename/move a file with similar semantics // to what's usually done on UNIX - if there's an existing file with // it is removed before the file is renamed/moved. The @@ -870,7 +853,7 @@ ACE_OS::rename (const wchar_t *old_name, ACE_UNUSED_ARG (new_name); ACE_UNUSED_ARG (flags); ACE_NOTSUP_RETURN (-1); -# elif defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_MOVEFILEEX) +# elif defined (ACE_WIN32) // NT4 (and up) provides a way to rename/move a file with similar semantics // to what's usually done on UNIX - if there's an existing file with // it is removed before the file is renamed/moved. The diff --git a/ACE/ace/OS_NS_sys_mman.inl b/ACE/ace/OS_NS_sys_mman.inl index 5ff514997b5..87cffd62937 100644 --- a/ACE/ace/OS_NS_sys_mman.inl +++ b/ACE/ace/OS_NS_sys_mman.inl @@ -40,11 +40,11 @@ ACE_OS::mmap (void *addr, const ACE_TCHAR *file_mapping_name) { ACE_OS_TRACE ("ACE_OS::mmap"); -#if !defined (ACE_WIN32) || defined (ACE_HAS_PHARLAP) +#if !defined (ACE_WIN32) ACE_UNUSED_ARG (file_mapping_name); -#endif /* !defined (ACE_WIN32) || defined (ACE_HAS_PHARLAP) */ +#endif /* !defined (ACE_WIN32) */ -#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) +#if defined (ACE_WIN32) if (!ACE_BIT_ENABLED (flags, MAP_FIXED)) addr = 0; else if (addr == 0) // can not map to address 0 @@ -149,7 +149,7 @@ ACE_OS::mmap (void *addr, ACE_UNUSED_ARG (file_mapping); ACE_UNUSED_ARG (sa); ACE_NOTSUP_RETURN (MAP_FAILED); -#endif /* ACE_WIN32 && !ACE_HAS_PHARLAP */ +#endif /* ACE_WIN32 */ } // Implements simple read/write control for pages. Affects a page if @@ -161,7 +161,7 @@ ACE_INLINE int ACE_OS::mprotect (void *addr, size_t len, int prot) { ACE_OS_TRACE ("ACE_OS::mprotect"); -#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) +#if defined (ACE_WIN32) DWORD dummy; // Sigh! return ::VirtualProtect(addr, len, prot, &dummy) ? 0 : -1; #elif !defined (ACE_LACKS_MPROTECT) @@ -171,16 +171,15 @@ ACE_OS::mprotect (void *addr, size_t len, int prot) ACE_UNUSED_ARG (len); ACE_UNUSED_ARG (prot); ACE_NOTSUP_RETURN (-1); -#endif /* ACE_WIN32 && !ACE_HAS_PHARLAP */ +#endif /* ACE_WIN32 */ } ACE_INLINE int ACE_OS::msync (void *addr, size_t len, int sync) { ACE_OS_TRACE ("ACE_OS::msync"); -#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) +#if defined (ACE_WIN32) ACE_UNUSED_ARG (sync); - ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::FlushViewOfFile (addr, len), ace_result_), int, -1); #elif !defined (ACE_LACKS_MSYNC) return ::msync ((ACE_MMAP_TYPE) addr, len, sync); @@ -189,7 +188,7 @@ ACE_OS::msync (void *addr, size_t len, int sync) ACE_UNUSED_ARG (len); ACE_UNUSED_ARG (sync); ACE_NOTSUP_RETURN (-1); -#endif /* ACE_WIN32 && !ACE_HAS_PHARLAP */ +#endif /* ACE_WIN32 */ } ACE_INLINE int diff --git a/ACE/ace/OS_NS_sys_socket.inl b/ACE/ace/OS_NS_sys_socket.inl index 3cbce8dc578..3b53035a777 100644 --- a/ACE/ace/OS_NS_sys_socket.inl +++ b/ACE/ace/OS_NS_sys_socket.inl @@ -400,13 +400,6 @@ ACE_OS::recvfrom (ACE_HANDLE handle, } else { -# if defined (ACE_HAS_PHARLAP) - // Pharlap ETS (at least to v13) returns a legit address but doesn't - // include the sin_zero[8] bytes in the count. Correct for this here. - if (addrlen != 0 && addr != 0 && - *addrlen == 8 && addr->sa_family == AF_INET) - *addrlen = sizeof(sockaddr_in); -# endif /* ACE_HAS_PHARLAP */ return result; } #else /* non Win32 */ diff --git a/ACE/ace/OS_NS_sys_utsname.cpp b/ACE/ace/OS_NS_sys_utsname.cpp index 604947b5825..8d4da8dbddd 100644 --- a/ACE/ace/OS_NS_sys_utsname.cpp +++ b/ACE/ace/OS_NS_sys_utsname.cpp @@ -41,21 +41,7 @@ ACE_OS::uname (ACE_utsname *name) # endif SYSTEM_INFO sinfo; -# if defined (ACE_HAS_PHARLAP) - // PharLap doesn't do GetSystemInfo. What's really wanted is the - // CPU architecture, so we can get that with EtsGetSystemInfo. Fill - // in what's wanted in the SYSTEM_INFO structure, and carry on. Note - // that the CPU type values in EK_KERNELINFO have the same values - // are the ones defined for SYSTEM_INFO. - EK_KERNELINFO ets_kern; - EK_SYSTEMINFO ets_sys; - EtsGetSystemInfo (&ets_kern, &ets_sys); - sinfo.wProcessorLevel = static_cast (ets_kern.CpuType); - sinfo.wProcessorArchitecture = PROCESSOR_ARCHITECTURE_INTEL; - sinfo.dwProcessorType = ets_kern.CpuType * 100 + 86; -# else ::GetSystemInfo(&sinfo); -# endif /* ACE_HAS_PHARLAP */ const char* unknown = "???"; diff --git a/ACE/ace/OS_NS_unistd.cpp b/ACE/ace/OS_NS_unistd.cpp index 49b5736f970..d151b885fb9 100644 --- a/ACE/ace/OS_NS_unistd.cpp +++ b/ACE/ace/OS_NS_unistd.cpp @@ -380,9 +380,7 @@ ACE_OS::num_processors () { ACE_OS_TRACE ("ACE_OS::num_processors"); -#if defined (ACE_HAS_PHARLAP) - return 1; -#elif defined (ACE_WIN32) +#if defined (ACE_WIN32) SYSTEM_INFO sys_info; ::GetSystemInfo (&sys_info); return sys_info.dwNumberOfProcessors; @@ -408,9 +406,7 @@ ACE_OS::num_processors_online () { ACE_OS_TRACE ("ACE_OS::num_processors_online"); -#if defined (ACE_HAS_PHARLAP) - return 1; -#elif defined (ACE_WIN32) +#if defined (ACE_WIN32) SYSTEM_INFO sys_info; ::GetSystemInfo (&sys_info); long active_processors = 0; diff --git a/ACE/ace/OS_NS_unistd.inl b/ACE/ace/OS_NS_unistd.inl index 8c5d2834ade..cc99a4cb982 100644 --- a/ACE/ace/OS_NS_unistd.inl +++ b/ACE/ace/OS_NS_unistd.inl @@ -79,7 +79,7 @@ ACE_INLINE long ACE_OS::getpagesize () { ACE_OS_TRACE ("ACE_OS::getpagesize"); -#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) +#if defined (ACE_WIN32) SYSTEM_INFO sys_info; ::GetSystemInfo (&sys_info); return (long) sys_info.dwPageSize; @@ -356,16 +356,9 @@ ACE_OS::ftruncate (ACE_HANDLE handle, ACE_OFF_T offset) { ACE_OS_TRACE ("ACE_OS::ftruncate"); #if defined (ACE_WIN32) -# if !defined (ACE_LACKS_WIN32_SETFILEPOINTEREX) LARGE_INTEGER loff; loff.QuadPart = offset; if (::SetFilePointerEx (handle, loff, 0, FILE_BEGIN)) -# else - if (::SetFilePointer (handle, - offset, - 0, - FILE_BEGIN) != INVALID_SET_FILE_POINTER) -# endif ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::SetEndOfFile (handle), ace_result_), int, -1); else ACE_FAIL_RETURN (-1); @@ -512,19 +505,7 @@ ACE_INLINE int ACE_OS::hostname (char name[], size_t maxnamelen) { ACE_OS_TRACE ("ACE_OS::hostname"); -#if defined (ACE_HAS_PHARLAP) - // PharLap only can do net stuff with the RT version. -# if defined (ACE_HAS_PHARLAP_RT) - // @@This is not at all reliable... requires ethernet and BOOTP to be used. - // A more reliable way is to go thru the devices w/ EtsTCPGetDeviceCfg until - // a legit IP address is found, then get its name w/ gethostbyaddr. - ACE_SOCKCALL_RETURN (gethostname (name, maxnamelen), int, SOCKET_ERROR); -# else - ACE_UNUSED_ARG (name); - ACE_UNUSED_ARG (maxnamelen); - ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_PHARLAP_RT */ -#elif defined (ACE_VXWORKS) +#if defined (ACE_VXWORKS) return ::gethostname (name, maxnamelen); #elif defined (ACE_WIN32) if (::gethostname (name, ACE_Utils::truncate_cast (maxnamelen)) == 0) @@ -548,7 +529,7 @@ ACE_OS::hostname (char name[], size_t maxnamelen) return -1; #elif defined (ACE_LACKS_GETHOSTNAME) ACE_NOTSUP_RETURN (-1); -#else /* ACE_HAS_PHARLAP */ +#else /* ACE_VXWORKS */ ACE_utsname host_info; if (ACE_OS::uname (&host_info) == -1) @@ -558,7 +539,7 @@ ACE_OS::hostname (char name[], size_t maxnamelen) ACE_OS::strsncpy (name, host_info.nodename, maxnamelen); return 0; } -#endif /* ACE_HAS_PHARLAP */ +#endif /* ACE_VXWORKS */ } #if defined (ACE_HAS_WCHAR) @@ -687,7 +668,6 @@ ACE_OS::llseek (ACE_HANDLE handle, ACE_LOFF_T offset, int whence) return ::lseek64 (handle, offset, whence); #elif defined (ACE_HAS_LLSEEK) # if defined (ACE_WIN32) -# ifndef ACE_LACKS_WIN32_SETFILEPOINTEREX LARGE_INTEGER distance, new_file_pointer; distance.QuadPart = offset; @@ -696,22 +676,6 @@ ACE_OS::llseek (ACE_HANDLE handle, ACE_LOFF_T offset, int whence) (::SetFilePointerEx (handle, distance, &new_file_pointer, whence) ? new_file_pointer.QuadPart : static_cast (-1)); -# else - LARGE_INTEGER l_offset; - l_offset.QuadPart = offset; - LONG low_offset = l_offset.LowPart; - LONG high_offset = l_offset.HighPart; - - l_offset.LowPart = ::SetFilePointer (handle, - low_offset, - &high_offset, - whence); - if (l_offset.LowPart == INVALID_SET_FILE_POINTER && - GetLastError () != NO_ERROR) - return static_cast (-1); - l_offset.HighPart = high_offset; - return l_offset.QuadPart; -# endif /* ACE_LACKS_WIN32_SETFILEPOINTEREX */ # else return ::llseek (handle, offset, whence); # endif /* WIN32 */ @@ -1071,29 +1035,17 @@ ACE_OS::truncate (const ACE_TCHAR *filename, O_WRONLY, ACE_DEFAULT_FILE_PERMS); -# if !defined (ACE_LACKS_WIN32_SETFILEPOINTEREX) LARGE_INTEGER loffset; loffset.QuadPart = offset; -#else - LONG low_offset = ACE_LOW_PART(offset); - LONG high_offset = ACE_HIGH_PART(offset); -#endif if (handle == ACE_INVALID_HANDLE) ACE_FAIL_RETURN (-1); -# if !defined (ACE_LACKS_WIN32_SETFILEPOINTEREX) - else if (::SetFilePointerEx (handle, - loffset, - 0, - FILE_BEGIN)) -# else else if (::SetFilePointer (handle, low_offset, &high_offset, FILE_BEGIN) != INVALID_SET_FILE_POINTER || GetLastError () == NO_ERROR) -# endif /* ACE_LACKS_WIN32_SETFILEPOINTEREX */ { BOOL result = ::SetEndOfFile (handle); ::CloseHandle (handle); diff --git a/ACE/ace/Pagefile_Memory_Pool.cpp b/ACE/ace/Pagefile_Memory_Pool.cpp index 8af6e554b66..f5523223c68 100644 --- a/ACE/ace/Pagefile_Memory_Pool.cpp +++ b/ACE/ace/Pagefile_Memory_Pool.cpp @@ -19,7 +19,7 @@ #include "ace/Based_Pointer_Repository.h" #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */ -#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) +#if defined (ACE_WIN32) #define ACE_MAP_FILE(_hnd, _access, _offHigh, _offLow, _nBytes, _baseAdd) \ MapViewOfFileEx (_hnd, _access, _offHigh, _offLow, _nBytes, _baseAdd) @@ -217,7 +217,6 @@ ACE_Pagefile_Memory_Pool::map (int &first_time, // Create file mapping, if not yet done if (object_handle_ == 0) { -#if !defined (ACE_LACKS_WIN32_SECURITY_DESCRIPTORS) // Allow access by all users. SECURITY_ATTRIBUTES sa; SECURITY_DESCRIPTOR sd; @@ -230,7 +229,6 @@ ACE_Pagefile_Memory_Pool::map (int &first_time, sa.nLength = sizeof (SECURITY_ATTRIBUTES); sa.lpSecurityDescriptor = &sd; sa.bInheritHandle = FALSE; -#endif /* ACE_LACKS_WIN32_SECURITY_DESCRIPTORS */ // Get an object handle to the named reserved memory object. DWORD size_high; @@ -245,11 +243,7 @@ ACE_Pagefile_Memory_Pool::map (int &first_time, object_handle_ = ACE_TEXT_CreateFileMapping (INVALID_HANDLE_VALUE, -#if !defined (ACE_LACKS_WIN32_SECURITY_DESCRIPTORS) &sa, -#else - 0, -#endif /* !ACE_LACKS_WIN32_SECURITY_DESCRIPTORS */ PAGE_READWRITE | SEC_RESERVE, size_high, size_low, @@ -369,4 +363,4 @@ ACE_Pagefile_Memory_Pool::map (int &first_time, ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* ACE_WIN32 && !ACE_HAS_PHARLAP */ +#endif /* ACE_WIN32 */ diff --git a/ACE/ace/Pagefile_Memory_Pool.h b/ACE/ace/Pagefile_Memory_Pool.h index 254a5a7ad8a..4e8d4af8315 100644 --- a/ACE/ace/Pagefile_Memory_Pool.h +++ b/ACE/ace/Pagefile_Memory_Pool.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) +#if defined (ACE_WIN32) #include "ace/ACE.h" #include "ace/os_include/sys/os_mman.h" @@ -190,7 +190,7 @@ private: ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* ACE_WIN32 && !ACE_HAS_PHARLAP */ +#endif /* ACE_WIN32 */ #if defined (__ACE_INLINE__) #include "ace/Pagefile_Memory_Pool.inl" diff --git a/ACE/ace/Pagefile_Memory_Pool.inl b/ACE/ace/Pagefile_Memory_Pool.inl index e6b2919d873..46734e75ba7 100644 --- a/ACE/ace/Pagefile_Memory_Pool.inl +++ b/ACE/ace/Pagefile_Memory_Pool.inl @@ -1,5 +1,5 @@ // -*- C++ -*- -#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) +#if defined (ACE_WIN32) ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -48,4 +48,4 @@ ACE_Pagefile_Memory_Pool::base_addr () const ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* ACE_WIN32 &7 !ACE_HAS_PHARLAP */ +#endif /* ACE_WIN32 */ diff --git a/ACE/ace/README b/ACE/ace/README index 99d94841674..62d633530c5 100644 --- a/ACE/ace/README +++ b/ACE/ace/README @@ -712,10 +712,6 @@ ACE_LACKS_MPROTECT The platform doesn't have LYNX)) ACE_LACKS_MSG_ACCRIGHTS Platform defines ACE_HAS_MSG, but lacks msg_accrights{,len}. -ACE_LACKS_MSG_WFMO Platform lacks - MsgWaitForMultipleObjects - (only needs to be defined when - ACE_WIN32 is also defined). ACE_LACKS_MSYNC Platform lacks msync() (e.g., Linux) ACE_LACKS_MUTEXATTR_PSHARED Platform lacks @@ -868,10 +864,6 @@ ACE_LACKS_UNAME Platform lacks uname calls ACE_LACKS_WAIT The platform lacks wait ACE_LACKS_WIN32_GETPROCESSTIMES The Windows platform doesn't have GetProcessTimes(). -ACE_LACKS_WIN32_MOVEFILEEX The Windows platform doesn't have - MoveFileEx(). -ACE_LACKS_WIN32_SECURITY_DESCRIPTORS The Windows platform doesn't have - security descriptor support. ACE_LACKS_WRITEV Platform doesn't define writev, so use our own ACE_NEEDS_HUGE_THREAD_STACKSIZE Required by platforms with diff --git a/ACE/ace/Recursive_Thread_Mutex.cpp b/ACE/ace/Recursive_Thread_Mutex.cpp index 1f7b2dc8129..d75cf7d8354 100644 --- a/ACE/ace/Recursive_Thread_Mutex.cpp +++ b/ACE/ace/Recursive_Thread_Mutex.cpp @@ -79,7 +79,7 @@ int ACE_Recursive_Thread_Mutex::get_nesting_level () { // ACE_TRACE ("ACE_Recursive_Thread_Mutex::get_nesting_level"); -#if defined (ACE_HAS_VXTHREADS) || defined (ACE_HAS_PHARLAP) +#if defined (ACE_HAS_VXTHREADS) ACE_NOTSUP_RETURN (-1); #elif defined (ACE_HAS_RECURSIVE_MUTEXES) # if defined (ACE_WIN32) @@ -99,7 +99,7 @@ ACE_Recursive_Thread_Mutex::get_nesting_level () nesting_level = this->lock_.nesting_level_; ACE_OS::mutex_unlock (&this->lock_.nesting_mutex_); return nesting_level; -#endif /* ACE_HAS_VXTHREADS || ACE_HAS_PHARLAP */ +#endif /* ACE_HAS_VXTHREADS */ } void diff --git a/ACE/ace/Registry.cpp b/ACE/ace/Registry.cpp index ddd8e77923e..cc98d803395 100644 --- a/ACE/ace/Registry.cpp +++ b/ACE/ace/Registry.cpp @@ -1,6 +1,6 @@ #include "ace/Registry.h" -#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY) +#if defined (ACE_WIN32) # include "ace/os_include/os_netdb.h" # include "ace/OS_NS_unistd.h" @@ -1113,4 +1113,4 @@ ACE_Predefined_Naming_Contexts::is_local_host (const ACE_TCHAR *machine_name) ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_REGISTRY */ +#endif /* ACE_WIN32 */ diff --git a/ACE/ace/Registry.h b/ACE/ace/Registry.h index 8d5e613116e..f58f1a9808f 100644 --- a/ACE/ace/Registry.h +++ b/ACE/ace/Registry.h @@ -19,8 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY) -// This only works on registry-capable Win32 platforms. +#if defined (ACE_WIN32) #include "ace/Containers.h" #include "ace/SString.h" @@ -553,6 +552,6 @@ private: ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_REGISTRY */ +#endif /* ACE_WIN32 */ #include /**/ "ace/post.h" #endif /* ACE_REGISTRY_H */ diff --git a/ACE/ace/SPIPE_Connector.cpp b/ACE/ace/SPIPE_Connector.cpp index c507b47ee92..2822fa82b53 100644 --- a/ACE/ace/SPIPE_Connector.cpp +++ b/ACE/ace/SPIPE_Connector.cpp @@ -67,7 +67,7 @@ ACE_SPIPE_Connector::connect (ACE_SPIPE_Stream &new_io, ACE_HANDLE handle; ACE_UNUSED_ARG (pipe_mode); -#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) +#if defined (ACE_WIN32) // We need to allow for more than one attempt to connect, // calculate the absolute time at which we give up. ACE_Time_Value absolute_time; @@ -143,11 +143,11 @@ ACE_SPIPE_Connector::connect (ACE_SPIPE_Stream &new_io, } } } -#else /* ACE_WIN32 && !ACE_HAS_PHARLAP */ +#else /* ACE_WIN32 */ handle = ACE::handle_timed_open (timeout, remote_sap.get_path_name (), flags, perms, sa); -#endif /* !ACE_WIN32 || ACE_HAS_PHARLAP */ +#endif /* !ACE_WIN32 */ new_io.set_handle (handle); new_io.remote_addr_ = remote_sap; // class copy. diff --git a/ACE/ace/Sock_Connect.cpp b/ACE/ace/Sock_Connect.cpp index 37e8ea1a339..6d7fd6b1282 100644 --- a/ACE/ace/Sock_Connect.cpp +++ b/ACE/ace/Sock_Connect.cpp @@ -30,7 +30,7 @@ const struct in6_addr in6addr_linklocal_allnodes = IN6ADDR_LINKLOCAL_ALLNODES_IN const struct in6_addr in6addr_linklocal_allrouters = IN6ADDR_LINKLOCAL_ALLROUTERS_INIT; #endif /* ACE_VXWORKS <= 0x670 && __RTP__ && ACE_HAS_IPV6 */ -#if defined (ACE_WIN32) && defined (ACE_HAS_PHARLAP) +#if defined (ACE_WIN32) # include "ace/OS_NS_stdio.h" #endif @@ -438,89 +438,6 @@ static int get_ip_interfaces_win32 (size_t &count, ACE_INET_Addr *&addrs) { -# if defined (ACE_HAS_PHARLAP) - // PharLap ETS has its own kernel routines to rummage through the device - // configs and extract the interface info, but only for Pharlap RT. -# if !defined (ACE_HAS_PHARLAP_RT) - ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_PHARLAP_RT */ - - // Locate all of the IP devices in the system, saving a DEVHANDLE - // for each. Then allocate the ACE_INET_Addrs needed and fetch all - // the IP addresses. To locate the devices, try the available - // device name roots and increment the device number until the - // kernel says there are no more of that type. - const size_t ACE_MAX_ETS_DEVICES = 64; // Arbitrary, but should be enough. - DEVHANDLE ip_dev[ACE_MAX_ETS_DEVICES]; - EK_TCPIPCFG *devp = 0; - size_t i, j; - ACE_TCHAR dev_name[16]; - - count = 0; - for (i = 0; count < ACE_MAX_ETS_DEVICES; i++, ++count) - { - // Ethernet. - ACE_OS::sprintf (dev_name, - "ether%d", - i); - ip_dev[count] = EtsTCPGetDeviceHandle (dev_name); - if (ip_dev[count] == 0) - break; - } - for (i = 0; count < ACE_MAX_ETS_DEVICES; i++, ++count) - { - // SLIP. - ACE_OS::sprintf (dev_name, - "sl%d", - i); - ip_dev[count] = EtsTCPGetDeviceHandle (dev_name); - if (ip_dev[count] == 0) - break; - } - for (i = 0; count < ACE_MAX_ETS_DEVICES; i++, ++count) - { - // PPP. - ACE_OS::sprintf (dev_name, - "ppp%d", - i); - ip_dev[count] = EtsTCPGetDeviceHandle (dev_name); - if (ip_dev[count] == 0) - break; - } - - if (count > 0) - ACE_NEW_RETURN (addrs, - ACE_INET_Addr[count], - -1); - else - addrs = 0; - - for (i = 0, j = 0; i < count; i++) - { - devp = EtsTCPGetDeviceCfg (ip_dev[i]); - if (devp != 0) - { - addrs[j].set (0, - devp->nwIPAddress, - 0); // Already in net order. - ++j; - } - // There's no call to close the DEVHANDLE. - } - - count = j; - if (count == 0 && addrs != 0) - { - delete [] addrs; - addrs = 0; - } - - return 0; - - -# else - // All non-CE, non-Pharlap Windows. Must support Winsock2. - int i, n_interfaces, status; INTERFACE_INFO info[64]; @@ -637,8 +554,6 @@ get_ip_interfaces_win32 (size_t &count, } return 0; - -# endif /* ACE_HAS_PHARLAP */ } #elif defined (ACE_HAS_GETIFADDRS) diff --git a/ACE/ace/WFMO_Reactor.cpp b/ACE/ace/WFMO_Reactor.cpp index f5cd8859ebb..cf935f9dd45 100644 --- a/ACE/ace/WFMO_Reactor.cpp +++ b/ACE/ace/WFMO_Reactor.cpp @@ -1763,18 +1763,6 @@ ACE_WFMO_Reactor::ok_to_wait (ACE_Time_Value *max_wait_time, DWORD result = 0; while (1) { -# if defined (ACE_HAS_PHARLAP) - // PharLap doesn't implement WaitForMultipleObjectsEx, and doesn't - // do async I/O, so it's not needed in this case anyway. - result = ::WaitForMultipleObjects (sizeof this->atomic_wait_array_ / sizeof (ACE_HANDLE), - this->atomic_wait_array_, - TRUE, - timeout); - - if (result != WAIT_IO_COMPLETION) - break; - -# else result = ::WaitForMultipleObjectsEx (sizeof this->atomic_wait_array_ / sizeof (ACE_HANDLE), this->atomic_wait_array_, TRUE, @@ -1783,8 +1771,6 @@ ACE_WFMO_Reactor::ok_to_wait (ACE_Time_Value *max_wait_time, if (result != WAIT_IO_COMPLETION) break; - -# endif /* ACE_HAS_PHARLAP */ } switch (result) @@ -1811,22 +1797,11 @@ ACE_WFMO_Reactor::wait_for_multiple_events (int timeout, // Wait for any of handles_ to be active, or until timeout expires. // If is enabled allow asynchronous completion of // ReadFile and WriteFile operations. - -#if defined (ACE_HAS_PHARLAP) - // PharLap doesn't do async I/O and doesn't implement - // WaitForMultipleObjectsEx, so use WaitForMultipleObjects. - ACE_UNUSED_ARG (alertable); - return ::WaitForMultipleObjects (this->handler_rep_.max_handlep1 (), - this->handler_rep_.handles (), - FALSE, - timeout); -#else return ::WaitForMultipleObjectsEx (this->handler_rep_.max_handlep1 (), this->handler_rep_.handles (), FALSE, timeout, alertable); -#endif /* ACE_HAS_PHARLAP */ } DWORD diff --git a/ACE/ace/config-macros.h b/ACE/ace/config-macros.h index 144e0283d98..ac57a80e0b3 100644 --- a/ACE/ace/config-macros.h +++ b/ACE/ace/config-macros.h @@ -101,7 +101,7 @@ # if !defined (ACE_HAS_PROCESS_SPAWN) # if !defined (ACE_LACKS_FORK) || \ - (defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP)) + (defined (ACE_WIN32)) # define ACE_HAS_PROCESS_SPAWN 1 # endif # endif /* ACE_HAS_PROCESS_SPAWN */ diff --git a/ACE/ace/config-pharlap.h b/ACE/ace/config-pharlap.h deleted file mode 100644 index dbc933bc574..00000000000 --- a/ACE/ace/config-pharlap.h +++ /dev/null @@ -1,89 +0,0 @@ -/* -*- C++ -*- */ -// This configuration file is for use with the PharLap Realtime ETS Kernel. -// It has been tested with PharLap TNT Embedded ToolSuite version 9.1. - -#ifndef ACE_CONFIG_PHARLAP_H -#define ACE_CONFIG_PHARLAP_H -#include /**/ "ace/pre.h" - -#define ACE_HAS_PHARLAP -// Some features are only available with the Realtime edition of ETS. -// Assume that if using ACE, the realtime version is also being used, but -// allow it to be turned off as well. -#ifndef ACE_HAS_PHARLAP_RT -# define ACE_HAS_PHARLAP_RT -#else -# if (ACE_HAS_PHARLAP_RT == 0) -# undef ACE_HAS_PHARLAP_RT -# endif -#endif - -// Fortunately, PharLap ETS offers much of the Win32 API. But it's still on -// Winsock 1.1 -#define ACE_HAS_WINSOCK2 0 -#define ACE_HAS_WINSOCK1 1 - -// The TSS implementation doesn't pass muster on the TSS_Test, but it works -// well with ACE's TSS emulation. -#define ACE_HAS_TSS_EMULATION - -#define ACE_LACKS_MMAP -#define ACE_LACKS_MPROTECT -#define ACE_LACKS_MSYNC -#define ACE_LACKS_TCP_NODELAY -#define ACE_LACKS_MSG_WFMO -#define ACE_LACKS_WIN32_MOVEFILEEX -#define ACE_LACKS_WIN32_REGISTRY -#define ACE_LACKS_WIN32_SECURITY_DESCRIPTORS -#define ACE_LACKS_WIN32_SERVICES -#define ACE_LACKS_WIN32_SETFILEPOINTEREX - -// There's no host table, by default. So using "localhost" won't work. -// If your system does have the ability to use "localhost" and you want to, -// define it before including this file. -#if !defined (ACE_LOCALHOST) -# define ACE_LOCALHOST "127.0.0.1" -#endif /* ACE_LOCALHOST */ - -// The normal Windows default stack size doesn't hold for ETS. Set what you -// want explicitly. -#if !defined (ACE_DEFAULT_THREAD_STACKSIZE) -# define ACE_DEFAULT_THREAD_STACKSIZE (1024*1024) -#endif /* ACE_DEFAULT_THREAD_STACKSIZE */ - -// Don't know how to get the page size at execution time. This is most likely -// the correct value. -#define ACE_PAGE_SIZE 4096 - -#if defined (ACE_HAS_PHARLAP_RT) -# define ACE_HAS_IP_MULTICAST - // ETS winsock doesn't define IP level socket options -//# define IP_TOS 8 -#endif /* ACE_HAS_PHARLAP_RT */ - -// Let the config-win32.h file do its thing -#undef ACE_CONFIG_H -#include "ace/config-win32.h" -// Now remove things that desktop/server Windows has but Pharlap ETS doesn't. -#undef ACE_HAS_INTERLOCKED_EXCHANGEADD -#undef ACE_HAS_WCHAR - -// PharLap's exports apparantly define LockFile, but it's documented as -// unsupported. LockFileEx is not present. -#define ACE_LACKS_FILELOCKS - -#include /**/ -#if defined (ACE_HAS_PHARLAP_RT) -# include /**/ -#define ACE_LACKS_IP_ADD_MEMBERSHIP -#endif /* ACE_HAS_PHARLAP_RT */ - -// Although IN_CLASSD is defined in both winsock.h and winsock2.h, it ends -// up undefined for Pharlap ETS builds. If this is the case, set things up -// so nothing looks like class D. -#if !defined (IN_CLASSD) -# define IN_CLASSD(i) (0) -#endif - -#include /**/ "ace/post.h" -#endif /* ACE_CONFIG_PHARLAP_H */ diff --git a/ACE/ace/config-win32-common.h b/ACE/ace/config-win32-common.h index f22fbb0f063..7e433c02da6 100644 --- a/ACE/ace/config-win32-common.h +++ b/ACE/ace/config-win32-common.h @@ -460,7 +460,7 @@ // PharLap ETS has its own winsock lib, so don't grab the one // supplied with the OS. -# if defined (_MSC_VER) && !defined (ACE_HAS_PHARLAP) +# if defined (_MSC_VER) # pragma comment(lib, "wsock32.lib") # endif /* _MSC_VER */ @@ -490,17 +490,14 @@ #define ACE_HAS_INTERLOCKED_EXCHANGEADD -#if !defined (ACE_HAS_PHARLAP) - -# if _WIN32_WINNT >= 0x400 -# define ACE_HAS_SIGNAL_OBJECT_AND_WAIT -# endif +#if _WIN32_WINNT >= 0x400 +# define ACE_HAS_SIGNAL_OBJECT_AND_WAIT +#endif // If CancelIO is undefined get the updated sp2-sdk from MS -# define ACE_HAS_CANCEL_IO -# define ACE_HAS_WIN32_OVERLAPPED_IO -# define ACE_HAS_WIN32_NAMED_PIPES -#endif /* !ACE_HAS_PHARLAP */ +#define ACE_HAS_CANCEL_IO +#define ACE_HAS_WIN32_OVERLAPPED_IO +#define ACE_HAS_WIN32_NAMED_PIPES #if !defined (ACE_SEH_DEFAULT_EXCEPTION_HANDLING_ACTION) # define ACE_SEH_DEFAULT_EXCEPTION_HANDLING_ACTION EXCEPTION_CONTINUE_SEARCH @@ -544,9 +541,7 @@ # define ACE_DISABLES_THREAD_LIBRARY_CALLS 0 #endif /* ACE_DISABLES_THREAD_LIBRARY_CALLS */ -#if !defined (ACE_HAS_PHARLAP) -# define ACE_HAS_LOG_MSG_NT_EVENT_LOG -#endif /* !ACE_HAS_PHARLAP */ +#define ACE_HAS_LOG_MSG_NT_EVENT_LOG #define ACE_HAS_LLSEEK diff --git a/ACE/ace/os_include/netinet/os_in.h b/ACE/ace/os_include/netinet/os_in.h index f71e757532b..a9bca3fe2f8 100644 --- a/ACE/ace/os_include/netinet/os_in.h +++ b/ACE/ace/os_include/netinet/os_in.h @@ -41,11 +41,9 @@ extern "C" #endif /* !ACE_LACKS_NETINET_IN_H */ -# if defined (ACE_HAS_PHARLAP_RT) -# define ACE_IPPROTO_TCP SOL_SOCKET -# elif !defined (ACE_IPPROTO_TCP) +# if !defined (ACE_IPPROTO_TCP) # define ACE_IPPROTO_TCP IPPROTO_TCP -# endif /* ACE_HAS_PHARLAP_RT */ +# endif /* !ACE_IPPROTO_TCP */ # if !defined (ACE_HAS_IP_MULTICAST) && defined (ACE_LACKS_IP_ADD_MEMBERSHIP) // Even if ACE_HAS_IP_MULTICAST is not defined, if IP_ADD_MEMBERSHIP diff --git a/ACE/apps/gperf/src/Options.h b/ACE/apps/gperf/src/Options.h index 1bfac29b593..e679193cea0 100644 --- a/ACE/apps/gperf/src/Options.h +++ b/ACE/apps/gperf/src/Options.h @@ -71,12 +71,6 @@ enum Option_Type // g++ doesn't seem to do the right thing with them at the // moment... ;-( -// PharLap ETS defines EOS as well... so if building for ETS, clear out -// their EOS. -#if defined (ACE_HAS_PHARLAP) && defined (EOS) -# undef EOS -#endif /* ACE_HAS_PHARLAP && EOS */ - enum { MAX_KEY_POS = 128 - 1, /**< Max size of each word's key set. */ diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h b/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h index b14823f17b0..9ab9456110e 100644 --- a/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h +++ b/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h @@ -49,12 +49,7 @@ #define ACE_LOG_FILE_EXT_NAME ACE_TEXT (".log") -#if defined (ACE_HAS_PHARLAP) -const size_t ACE_MAX_CLIENTS = 4; -#else const size_t ACE_MAX_CLIENTS = 30; -#endif /* ACE_HAS_PHARLAP */ - const size_t ACE_NS_MAX_ENTRIES = 1000; const size_t ACE_DEFAULT_USECS = 1000; const size_t ACE_MAX_TIMERS = 4; @@ -170,7 +165,7 @@ inline ACE_Test_Output::~ACE_Test_Output () ACE_LOG_MSG->clr_flags (ACE_Log_Msg::OSTREAM); ACE_LOG_MSG->set_flags (ACE_Log_Msg::STDERR); -#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) && !defined (ACE_HAS_PHARLAP) +#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) delete this->output_file_; #endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */ } @@ -184,13 +179,6 @@ ACE_Test_Output::output_file () inline int ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) { -#if defined (ACE_HAS_PHARLAP) - // For PharLap, just send it all to the host console for now - redirect - // to a file there for saving/analysis. - EtsSelectConsole(ETS_CO_HOST); - ACE_LOG_MSG->msg_ostream (&cout); - -#else ACE_TCHAR temp[MAXPATHLEN]; // Ignore the error value since the directory may already exist. const ACE_TCHAR *test_dir {}; @@ -243,8 +231,6 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) # endif /* ACE_LACKS_IOSTREAM_TOTALLY */ ACE_LOG_MSG->msg_ostream (this->output_file ()); -#endif /* ACE_HAS_PHARLAP */ - ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER ); ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM); diff --git a/ACE/tests/Conn_Test.cpp b/ACE/tests/Conn_Test.cpp index c44c607df25..b44f9547a9c 100644 --- a/ACE/tests/Conn_Test.cpp +++ b/ACE/tests/Conn_Test.cpp @@ -81,16 +81,8 @@ using CACHED_CONNECT_STRATEGY = ACE_Cached_Connect_Strategy // Default number of clients/servers. -#if defined (ACE_HAS_PHARLAP) -// PharLap is, by default, resource contrained. Test for something that works -// on the default configuration. -static int n_servers = 2; -static int n_clients = 4; -#else static int n_servers = 5; static int n_clients = 5; -#endif /* ACE_HAS_PHARLAP */ - static int n_client_iterations = 3; Svc_Handler::Svc_Handler (ACE_Thread_Manager *) diff --git a/ACE/tests/Log_Msg_Test.cpp b/ACE/tests/Log_Msg_Test.cpp index 96262570a46..045152faec2 100644 --- a/ACE/tests/Log_Msg_Test.cpp +++ b/ACE/tests/Log_Msg_Test.cpp @@ -506,7 +506,7 @@ test_ostream () 1); } -#if !defined (ACE_VXWORKS) && !defined (ACE_HAS_PHARLAP) || (defined(ACE_VXWORKS) && (ACE_VXWORKS > 0x690)) +#if !defined (ACE_VXWORKS) || (defined(ACE_VXWORKS) && (ACE_VXWORKS > 0x690)) # define TEST_CAN_UNLINK_IN_ADVANCE #endif diff --git a/ACE/tests/Test_Output.cpp b/ACE/tests/Test_Output.cpp index a886cfed6a3..664b2e5ed90 100644 --- a/ACE/tests/Test_Output.cpp +++ b/ACE/tests/Test_Output.cpp @@ -52,8 +52,7 @@ ACE_Test_Output::~ACE_Test_Output () ACE_LOG_MSG->clr_flags (ACE_Log_Msg::OSTREAM); ACE_LOG_MSG->set_flags (ACE_Log_Msg::STDERR); -#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) && \ - (!defined (ACE_HAS_PHARLAP) || defined (ACE_PHARLAP_TESTLOG_TO_FILE)) +#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) delete this->output_file_; #endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */ } @@ -74,13 +73,6 @@ ACE_Test_Output::output_file () int ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) { -#if defined (ACE_HAS_PHARLAP) && !defined (ACE_PHARLAP_TESTLOG_TO_FILE) - // For PharLap, just send it all to the host console for now - redirect - // to a file there for saving/analysis. - EtsSelectConsole(ETS_CO_HOST); - ACE_LOG_MSG->msg_ostream (&cout); - -#else ACE_TCHAR temp[MAXPATHLEN + 1] = { 0 }; // Ignore the error value since the directory may already exist. const ACE_TCHAR *test_dir = 0; @@ -151,8 +143,6 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) # endif /* ACE_LACKS_IOSTREAM_TOTALLY */ ACE_LOG_MSG->msg_ostream (this->output_file_, 0); -#endif /* ACE_HAS_PHARLAP && !ACE_PHARLAP_TESTLOG_TO_FILE */ - ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER ); ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM); diff --git a/ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp b/ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp index edfbcf035a7..04eb3fc6ec7 100644 --- a/ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp +++ b/ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp @@ -56,7 +56,7 @@ static size_t svr_thrno = ACE_MAX_THREADS; // Default network parameters (MAX_BINDS and system buffers) are too small // for full test on some platforms; add platforms that can't handle too many // connection simultaneously here. -#if defined (ACE_VXWORKS) || defined (ACE_HAS_PHARLAP) +#if defined (ACE_VXWORKS) #define ACE_LOAD_FACTOR /2 #else #define ACE_LOAD_FACTOR diff --git a/ACE/tests/Thread_Pool_Reactor_Test.cpp b/ACE/tests/Thread_Pool_Reactor_Test.cpp index aa654361fba..e792840294d 100644 --- a/ACE/tests/Thread_Pool_Reactor_Test.cpp +++ b/ACE/tests/Thread_Pool_Reactor_Test.cpp @@ -58,7 +58,7 @@ static size_t svr_thrno = ACE_MAX_THREADS; // Default network parameters (MAX_BINDS and system buffers) are too small // for full test on some platforms; add platforms that can't handle too many // connection simultaneously here. -#if defined (ACE_VXWORKS) || defined (ACE_HAS_PHARLAP) +#if defined (ACE_VXWORKS) #define ACE_LOAD_FACTOR /2 #else #define ACE_LOAD_FACTOR diff --git a/ACE/tests/test_config.h b/ACE/tests/test_config.h index beb395d7b6e..bcd4ecd0c3f 100644 --- a/ACE/tests/test_config.h +++ b/ACE/tests/test_config.h @@ -57,12 +57,7 @@ # define ACE_LOG_FILE_EXT_NAME ACE_TEXT (".log") #endif /* ACE_LOG_FILE_EXT_NAME */ -#if defined (ACE_HAS_PHARLAP) -size_t const ACE_MAX_CLIENTS = 4; -#else size_t const ACE_MAX_CLIENTS = 30; -#endif /* ACE_HAS_PHARLAP */ - size_t const ACE_NS_MAX_ENTRIES = 1000; size_t const ACE_DEFAULT_USECS = 1000; size_t const ACE_MAX_TIMERS = 4; diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp index 2f3c009efb1..f98ee2e1359 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp @@ -52,7 +52,7 @@ ACE_Test_Output::~ACE_Test_Output () ACE_LOG_MSG->clr_flags (ACE_Log_Msg::OSTREAM); ACE_LOG_MSG->set_flags (ACE_Log_Msg::STDERR); -#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) && !defined (ACE_HAS_PHARLAP) +#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) delete this->output_file_; #endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */ } @@ -66,13 +66,6 @@ ACE_Test_Output::output_file () int ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) { -#if defined (ACE_HAS_PHARLAP) - // For PharLap, just send it all to the host console for now - redirect - // to a file there for saving/analysis. - EtsSelectConsole(ETS_CO_HOST); - ACE_LOG_MSG->msg_ostream (&cout); - -#else ACE_TCHAR temp[MAXPATHLEN]; // Ignore the error value since the directory may already exist. const ACE_TCHAR *test_dir {}; @@ -139,8 +132,6 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) # endif /* ACE_LACKS_IOSTREAM_TOTALLY */ ACE_LOG_MSG->msg_ostream (this->output_file ()); -#endif /* ACE_HAS_PHARLAP */ - ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER); ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM); diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp index 2f3c009efb1..f98ee2e1359 100644 --- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp +++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp @@ -52,7 +52,7 @@ ACE_Test_Output::~ACE_Test_Output () ACE_LOG_MSG->clr_flags (ACE_Log_Msg::OSTREAM); ACE_LOG_MSG->set_flags (ACE_Log_Msg::STDERR); -#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) && !defined (ACE_HAS_PHARLAP) +#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) delete this->output_file_; #endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */ } @@ -66,13 +66,6 @@ ACE_Test_Output::output_file () int ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) { -#if defined (ACE_HAS_PHARLAP) - // For PharLap, just send it all to the host console for now - redirect - // to a file there for saving/analysis. - EtsSelectConsole(ETS_CO_HOST); - ACE_LOG_MSG->msg_ostream (&cout); - -#else ACE_TCHAR temp[MAXPATHLEN]; // Ignore the error value since the directory may already exist. const ACE_TCHAR *test_dir {}; @@ -139,8 +132,6 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) # endif /* ACE_LACKS_IOSTREAM_TOTALLY */ ACE_LOG_MSG->msg_ostream (this->output_file ()); -#endif /* ACE_HAS_PHARLAP */ - ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER); ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM); diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp index 2f3c009efb1..f98ee2e1359 100644 --- a/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp +++ b/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp @@ -52,7 +52,7 @@ ACE_Test_Output::~ACE_Test_Output () ACE_LOG_MSG->clr_flags (ACE_Log_Msg::OSTREAM); ACE_LOG_MSG->set_flags (ACE_Log_Msg::STDERR); -#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) && !defined (ACE_HAS_PHARLAP) +#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) delete this->output_file_; #endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */ } @@ -66,13 +66,6 @@ ACE_Test_Output::output_file () int ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) { -#if defined (ACE_HAS_PHARLAP) - // For PharLap, just send it all to the host console for now - redirect - // to a file there for saving/analysis. - EtsSelectConsole(ETS_CO_HOST); - ACE_LOG_MSG->msg_ostream (&cout); - -#else ACE_TCHAR temp[MAXPATHLEN]; // Ignore the error value since the directory may already exist. const ACE_TCHAR *test_dir {}; @@ -139,8 +132,6 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) # endif /* ACE_LACKS_IOSTREAM_TOTALLY */ ACE_LOG_MSG->msg_ostream (this->output_file ()); -#endif /* ACE_HAS_PHARLAP */ - ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER); ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM); diff --git a/TAO/orbsvcs/tests/HTIOP/test_config.h b/TAO/orbsvcs/tests/HTIOP/test_config.h index e08ad3c0a52..6c3b35dfd09 100644 --- a/TAO/orbsvcs/tests/HTIOP/test_config.h +++ b/TAO/orbsvcs/tests/HTIOP/test_config.h @@ -51,12 +51,7 @@ #define ACE_LOG_FILE_EXT_NAME ACE_TEXT (".log") -#if defined (ACE_HAS_PHARLAP) -size_t const ACE_MAX_CLIENTS = 4; -#else size_t const ACE_MAX_CLIENTS = 30; -#endif /* ACE_HAS_PHARLAP */ - size_t const ACE_NS_MAX_ENTRIES = 1000; size_t const ACE_DEFAULT_USECS = 1000; size_t const ACE_MAX_TIMERS = 4; diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp index 7a4f1bca094..ba09fe8cc93 100644 --- a/TAO/tao/Strategies/advanced_resource.cpp +++ b/TAO/tao/Strategies/advanced_resource.cpp @@ -452,9 +452,7 @@ TAO_Advanced_Resource_Factory::allocate_reactor_impl () const #endif /* ACE_WIN32 */ break; -#if defined(ACE_WIN32) \ - && !defined (ACE_LACKS_MSG_WFMO) \ - && !defined (ACE_HAS_PHARLAP) +#if defined(ACE_WIN32) && !defined (ACE_LACKS_MSG_WFMO) case TAO_REACTOR_MSGWFMO: ACE_NEW_RETURN (impl, ACE_Msg_WFMO_Reactor (0, tmq.get ()), 0); break; -- cgit v1.2.1 From 7f4365e65442e6c9d482fa64f808303f1546fe68 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 1 Feb 2023 15:52:25 +0100 Subject: Fixed cleanup mistake * ACE/ace/OS_NS_unistd.inl: --- ACE/ace/OS_NS_unistd.inl | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/ACE/ace/OS_NS_unistd.inl b/ACE/ace/OS_NS_unistd.inl index cc99a4cb982..455192e4ee0 100644 --- a/ACE/ace/OS_NS_unistd.inl +++ b/ACE/ace/OS_NS_unistd.inl @@ -1031,21 +1031,16 @@ ACE_OS::truncate (const ACE_TCHAR *filename, { ACE_OS_TRACE ("ACE_OS::truncate"); #if defined (ACE_WIN32) - ACE_HANDLE handle = ACE_OS::open (filename, - O_WRONLY, - ACE_DEFAULT_FILE_PERMS); + ACE_HANDLE handle = ACE_OS::open (filename, O_WRONLY, ACE_DEFAULT_FILE_PERMS); LARGE_INTEGER loffset; loffset.QuadPart = offset; if (handle == ACE_INVALID_HANDLE) - ACE_FAIL_RETURN (-1); - - else if (::SetFilePointer (handle, - low_offset, - &high_offset, - FILE_BEGIN) != INVALID_SET_FILE_POINTER - || GetLastError () == NO_ERROR) + { + ACE_FAIL_RETURN (-1); + } + else if (::SetFilePointerEx (handle, loffset, 0, FILE_BEGIN)) { BOOL result = ::SetEndOfFile (handle); ::CloseHandle (handle); -- cgit v1.2.1 From c67f33599590cf2e229da6a141fef90d0af6f034 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 1 Feb 2023 15:57:28 +0100 Subject: Remove includes * TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp: --- TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp index 05a518b049c..f4f43bb2f16 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp @@ -4,8 +4,6 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" #include "ace/os_include/os_netdb.h" -#include "ace/os_include/sys/os_pstat.h" -#include "ace/os_include/sys/os_loadavg.h" #if defined(__NetBSD__) || defined (__APPLE__) #include #endif -- cgit v1.2.1 From d90c1cb3964f254cb5e9a0de2d7f620b79750e16 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 1 Feb 2023 16:01:29 +0100 Subject: Removed left over sun file --- ACE/ace/config-suncc-common.h | 42 ------------------------------------------ 1 file changed, 42 deletions(-) delete mode 100644 ACE/ace/config-suncc-common.h diff --git a/ACE/ace/config-suncc-common.h b/ACE/ace/config-suncc-common.h deleted file mode 100644 index 75fafb245d4..00000000000 --- a/ACE/ace/config-suncc-common.h +++ /dev/null @@ -1,42 +0,0 @@ -// -*- C++ -*- -#ifndef ACE_SUNCC_COMMON_H -#define ACE_SUNCC_COMMON_H -#include /**/ "ace/pre.h" - -# define ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS -# define ACE_HAS_THR_C_DEST 1 -# define ACE_LACKS_SWAB -#if defined (ACE_HAS_CUSTOM_EXPORT_MACROS) && ACE_HAS_CUSTOM_EXPORT_MACROS == 0 -# undef ACE_HAS_CUSTOM_EXPORT_MACROS -#else -# ifndef ACE_HAS_CUSTOM_EXPORT_MACROS -# define ACE_HAS_CUSTOM_EXPORT_MACROS -# endif /* !ACE_HAS_CUSTOM_EXPORT_MACROS */ -# define ACE_Proper_Export_Flag __attribute__ ((visibility("default"))) -# define ACE_Proper_Import_Flag -# define ACE_EXPORT_SINGLETON_DECLARATION(T) template class ACE_Proper_Export_Flag T -# define ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class ACE_Proper_Export_Flag SINGLETON_TYPE ; -# define ACE_IMPORT_SINGLETON_DECLARATION(T) __extension__ extern template class T -# define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) __extension__ extern template class SINGLETON_TYPE; -#endif /* ACE_HAS_CUSTOM_EXPORT_MACROS == 0 */ - -#if (defined (i386) || defined (__i386__)) && !defined (ACE_SIZEOF_LONG_DOUBLE) -# define ACE_SIZEOF_LONG_DOUBLE 12 -#endif /* i386 */ - -#if defined (i386) || defined (__i386__) - // If running an Intel, assume that it's a Pentium so that - // ACE_OS::gethrtime () can use the RDTSC instruction. If running a - // 486 or lower, be sure to comment this out. (If not running an - // Intel CPU, this #define will not be seen because of the i386 - // protection, so it can be ignored.) -# define ACE_HAS_PENTIUM -#endif /* i386 */ - -#if !defined (ACE_LACKS_PRAGMA_ONCE) - // We define it with a -D with make depend. -# define ACE_LACKS_PRAGMA_ONCE -#endif /* ! ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "ace/post.h" -#endif /* ACE_SUNCC_COMMON_H */ -- cgit v1.2.1 From 007bcf039e9226a746bffbc0dcffa892c091adbe Mon Sep 17 00:00:00 2001 From: John McCabe Date: Wed, 1 Feb 2023 16:51:54 +0000 Subject: Align one endif with its associated if --- ACE/ace/config-g++-common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ACE/ace/config-g++-common.h b/ACE/ace/config-g++-common.h index 9ab89245007..b4c80688734 100644 --- a/ACE/ace/config-g++-common.h +++ b/ACE/ace/config-g++-common.h @@ -31,7 +31,7 @@ # define ACE_FALLTHROUGH [[gnu::fallthrough]] # else # define ACE_FALLTHROUGH -# endif +# endif # endif #endif -- cgit v1.2.1 From ec19b2725b53eba54c4ba434d371ae569832f762 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 1 Feb 2023 18:15:12 +0100 Subject: Removed include * TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp: --- TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp index d991ba35514..eb483d25b83 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp @@ -6,7 +6,6 @@ #include "ace/OS_NS_string.h" #include "ace/OS_NS_unistd.h" #include "ace/os_include/os_netdb.h" -#include "ace/os_include/sys/os_loadavg.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL -- cgit v1.2.1 From 716ee59f4081486404adae50f46172a39518e619 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 3 Feb 2023 19:49:42 +0100 Subject: Make destructor default * TAO/tao/SystemException.cpp: * TAO/tao/SystemException.h: --- TAO/tao/SystemException.cpp | 4 ---- TAO/tao/SystemException.h | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp index c4df7669a0d..9fb0157a11f 100644 --- a/TAO/tao/SystemException.cpp +++ b/TAO/tao/SystemException.cpp @@ -86,10 +86,6 @@ CORBA::SystemException::SystemException (const CORBA::SystemException &src) { } -CORBA::SystemException::~SystemException () -{ -} - CORBA::SystemException & CORBA::SystemException::operator= (const CORBA::SystemException &src) { diff --git a/TAO/tao/SystemException.h b/TAO/tao/SystemException.h index 1aeb7636e07..5f5fae29c26 100644 --- a/TAO/tao/SystemException.h +++ b/TAO/tao/SystemException.h @@ -92,7 +92,7 @@ namespace CORBA SystemException (const SystemException & src); /// Destructor. - virtual ~SystemException (); + virtual ~SystemException () = default; /// Get the minor status. ULong minor () const; -- cgit v1.2.1 From 89a05c65fd627673f0bcc260b990257dcf30150c Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 3 Feb 2023 19:49:52 +0100 Subject: Use nullptr * ACE/ace/Time_Policy.h: * ACE/ace/Time_Policy.inl: --- ACE/ace/Time_Policy.h | 2 +- ACE/ace/Time_Policy.inl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ACE/ace/Time_Policy.h b/ACE/ace/Time_Policy.h index b50d0594a4d..41a42eb1c39 100644 --- a/ACE/ace/Time_Policy.h +++ b/ACE/ace/Time_Policy.h @@ -108,7 +108,7 @@ class ACE_Dynamic_Time_Policy_Base; // forward decl class ACE_Export ACE_Delegating_Time_Policy { public: - ACE_Delegating_Time_Policy (ACE_Dynamic_Time_Policy_Base const * delegate = 0); + ACE_Delegating_Time_Policy (ACE_Dynamic_Time_Policy_Base const * delegate = nullptr); /// Return the current time according to this policy ACE_Time_Value_T operator()() const; diff --git a/ACE/ace/Time_Policy.inl b/ACE/ace/Time_Policy.inl index f057ed3a0f7..52fe49f1f27 100644 --- a/ACE/ace/Time_Policy.inl +++ b/ACE/ace/Time_Policy.inl @@ -76,7 +76,7 @@ ACE_Delegating_Time_Policy::set_gettimeofday (ACE_Time_Value (*)()) ACE_INLINE void ACE_Delegating_Time_Policy::set_delegate (ACE_Dynamic_Time_Policy_Base const * delegate) { - if (delegate != 0) + if (delegate) { this->delegate_ = delegate; } -- cgit v1.2.1 From 322d0a3e30d2e608108e0d7caf6bdcddbd728081 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 13 Feb 2023 11:42:23 +0100 Subject: Major cleanup in PortableServer library --- .../PortableServer/Active_Policy_Strategies.cpp | 320 +++++++++++---------- TAO/tao/PortableServer/Active_Policy_Strategies.h | 54 ++-- .../PortableServer/Active_Policy_Strategies.inl | 16 +- .../PortableServer/Default_Servant_Dispatcher.h | 6 +- TAO/tao/PortableServer/IdAssignmentPolicy.h | 4 +- TAO/tao/PortableServer/IdAssignmentStrategy.cpp | 10 - TAO/tao/PortableServer/IdAssignmentStrategy.h | 10 +- .../PortableServer/IdAssignmentStrategyFactory.h | 47 --- .../IdAssignmentStrategyFactoryImpl.cpp | 64 ----- .../IdAssignmentStrategyFactoryImpl.h | 49 ---- .../PortableServer/IdAssignmentStrategySystem.cpp | 13 - .../PortableServer/IdAssignmentStrategySystem.h | 15 +- .../PortableServer/IdAssignmentStrategyUser.cpp | 13 - TAO/tao/PortableServer/IdAssignmentStrategyUser.h | 15 +- TAO/tao/PortableServer/IdUniquenessPolicy.cpp | 2 +- TAO/tao/PortableServer/IdUniquenessPolicy.h | 4 +- TAO/tao/PortableServer/IdUniquenessStrategy.cpp | 23 ++ TAO/tao/PortableServer/IdUniquenessStrategy.h | 20 +- .../PortableServer/IdUniquenessStrategyFactory.h | 48 ---- .../IdUniquenessStrategyFactoryImpl.cpp | 93 ------ .../IdUniquenessStrategyFactoryImpl.h | 48 ---- .../IdUniquenessStrategyMultiple.cpp | 20 -- .../PortableServer/IdUniquenessStrategyMultiple.h | 23 +- .../PortableServer/IdUniquenessStrategyUnique.cpp | 27 +- .../PortableServer/IdUniquenessStrategyUnique.h | 27 +- .../IdUniquenessStrategyUniqueFactoryImpl.cpp | 59 ---- .../IdUniquenessStrategyUniqueFactoryImpl.h | 48 ---- .../PortableServer/ImplicitActivationStrategy.cpp | 23 -- .../PortableServer/ImplicitActivationStrategy.h | 8 +- .../ImplicitActivationStrategyExplicit.cpp | 13 - .../ImplicitActivationStrategyExplicit.h | 14 +- .../ImplicitActivationStrategyFactory.h | 47 --- .../ImplicitActivationStrategyFactoryImpl.cpp | 67 ----- .../ImplicitActivationStrategyFactoryImpl.h | 49 ---- .../ImplicitActivationStrategyImplicit.cpp | 13 - .../ImplicitActivationStrategyImplicit.h | 13 +- TAO/tao/PortableServer/LifespanStrategy.cpp | 7 +- TAO/tao/PortableServer/LifespanStrategy.h | 13 +- TAO/tao/PortableServer/LifespanStrategyFactory.h | 48 ---- .../PortableServer/LifespanStrategyFactoryImpl.cpp | 90 ------ .../PortableServer/LifespanStrategyFactoryImpl.h | 50 ---- .../PortableServer/LifespanStrategyPersistent.cpp | 6 - .../PortableServer/LifespanStrategyPersistent.h | 23 +- .../LifespanStrategyPersistentFactoryImpl.cpp | 58 ---- .../LifespanStrategyPersistentFactoryImpl.h | 50 ---- .../PortableServer/LifespanStrategyTransient.cpp | 6 - TAO/tao/PortableServer/LifespanStrategyTransient.h | 25 +- .../LifespanStrategyTransientFactoryImpl.cpp | 59 ---- .../LifespanStrategyTransientFactoryImpl.h | 51 ---- TAO/tao/PortableServer/Object_Adapter.cpp | 19 +- TAO/tao/PortableServer/Object_Adapter.h | 4 +- TAO/tao/PortableServer/Object_Adapter.inl | 4 +- TAO/tao/PortableServer/Policy_Strategy.h | 47 --- TAO/tao/PortableServer/PortableServer.cpp | 141 +-------- TAO/tao/PortableServer/Regular_POA.cpp | 4 - TAO/tao/PortableServer/Regular_POA.h | 10 +- .../PortableServer/RequestProcessingStrategy.cpp | 22 +- TAO/tao/PortableServer/RequestProcessingStrategy.h | 22 +- .../RequestProcessingStrategyAOMOnly.cpp | 15 +- .../RequestProcessingStrategyAOMOnly.h | 47 ++- ...RequestProcessingStrategyAOMOnlyFactoryImpl.cpp | 61 ---- .../RequestProcessingStrategyAOMOnlyFactoryImpl.h | 51 ---- .../RequestProcessingStrategyDefaultServant.cpp | 35 +-- .../RequestProcessingStrategyDefaultServant.h | 46 ++- .../RequestProcessingStrategyDefaultServantFI.cpp | 68 ----- .../RequestProcessingStrategyDefaultServantFI.h | 54 ---- .../RequestProcessingStrategyFactory.h | 50 ---- .../RequestProcessingStrategyFactoryImpl.cpp | 141 --------- .../RequestProcessingStrategyFactoryImpl.h | 50 ---- .../RequestProcessingStrategyServantActivator.cpp | 13 +- .../RequestProcessingStrategyServantActivator.h | 28 +- ...RequestProcessingStrategyServantActivatorFI.cpp | 80 ------ .../RequestProcessingStrategyServantActivatorFI.h | 54 ---- .../RequestProcessingStrategyServantLocator.cpp | 13 +- .../RequestProcessingStrategyServantLocator.h | 26 +- .../RequestProcessingStrategyServantLocatorFI.cpp | 81 ------ .../RequestProcessingStrategyServantLocatorFI.h | 54 ---- .../RequestProcessingStrategyServantManager.cpp | 10 - .../RequestProcessingStrategyServantManager.h | 19 +- TAO/tao/PortableServer/Root_POA.cpp | 12 +- TAO/tao/PortableServer/Root_POA.h | 4 +- .../PortableServer/ServantRetentionStrategy.cpp | 23 ++ TAO/tao/PortableServer/ServantRetentionStrategy.h | 13 +- .../ServantRetentionStrategyFactory.h | 47 --- .../ServantRetentionStrategyFactoryImpl.cpp | 95 ------ .../ServantRetentionStrategyFactoryImpl.h | 48 ---- .../ServantRetentionStrategyNonRetain.cpp | 12 +- .../ServantRetentionStrategyNonRetain.h | 75 +++-- ...ervantRetentionStrategyNonRetainFactoryImpl.cpp | 65 ----- .../ServantRetentionStrategyNonRetainFactoryImpl.h | 52 ---- .../ServantRetentionStrategyRetain.cpp | 20 +- .../ServantRetentionStrategyRetain.h | 78 ++--- .../ServantRetentionStrategyRetainFactoryImpl.cpp | 60 ---- .../ServantRetentionStrategyRetainFactoryImpl.h | 49 ---- TAO/tao/PortableServer/Servant_Location.h | 16 +- TAO/tao/PortableServer/Servant_Upcall.cpp | 2 +- TAO/tao/PortableServer/ThreadStrategy.cpp | 21 -- TAO/tao/PortableServer/ThreadStrategy.h | 13 +- TAO/tao/PortableServer/ThreadStrategyFactory.h | 49 ---- .../PortableServer/ThreadStrategyFactoryImpl.cpp | 95 ------ TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h | 48 ---- .../PortableServer/ThreadStrategyORBControl.cpp | 18 -- TAO/tao/PortableServer/ThreadStrategyORBControl.h | 12 +- TAO/tao/PortableServer/ThreadStrategySingle.cpp | 19 -- TAO/tao/PortableServer/ThreadStrategySingle.h | 8 +- .../ThreadStrategySingleFactoryImpl.cpp | 64 ----- .../ThreadStrategySingleFactoryImpl.h | 52 ---- 107 files changed, 561 insertions(+), 3589 deletions(-) delete mode 100644 TAO/tao/PortableServer/IdAssignmentStrategyFactory.h delete mode 100644 TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp delete mode 100644 TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h create mode 100644 TAO/tao/PortableServer/IdUniquenessStrategy.cpp delete mode 100644 TAO/tao/PortableServer/IdUniquenessStrategyFactory.h delete mode 100644 TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp delete mode 100644 TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h delete mode 100644 TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp delete mode 100644 TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h delete mode 100644 TAO/tao/PortableServer/ImplicitActivationStrategy.cpp delete mode 100644 TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h delete mode 100644 TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp delete mode 100644 TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h delete mode 100644 TAO/tao/PortableServer/LifespanStrategyFactory.h delete mode 100644 TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp delete mode 100644 TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h delete mode 100644 TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp delete mode 100644 TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h delete mode 100644 TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp delete mode 100644 TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h delete mode 100644 TAO/tao/PortableServer/Policy_Strategy.h delete mode 100644 TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp delete mode 100644 TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h delete mode 100644 TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp delete mode 100644 TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h delete mode 100644 TAO/tao/PortableServer/RequestProcessingStrategyFactory.h delete mode 100644 TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp delete mode 100644 TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h delete mode 100644 TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp delete mode 100644 TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h delete mode 100644 TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp delete mode 100644 TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h create mode 100644 TAO/tao/PortableServer/ServantRetentionStrategy.cpp delete mode 100644 TAO/tao/PortableServer/ServantRetentionStrategyFactory.h delete mode 100644 TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp delete mode 100644 TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h delete mode 100644 TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp delete mode 100644 TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h delete mode 100644 TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp delete mode 100644 TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h delete mode 100644 TAO/tao/PortableServer/ThreadStrategy.cpp delete mode 100644 TAO/tao/PortableServer/ThreadStrategyFactory.h delete mode 100644 TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp delete mode 100644 TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h delete mode 100644 TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp delete mode 100644 TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.cpp b/TAO/tao/PortableServer/Active_Policy_Strategies.cpp index cbb9434cf71..b457efcdc4f 100644 --- a/TAO/tao/PortableServer/Active_Policy_Strategies.cpp +++ b/TAO/tao/PortableServer/Active_Policy_Strategies.cpp @@ -2,31 +2,22 @@ #include "tao/PortableServer/Active_Policy_Strategies.h" #include "tao/PortableServer/POA_Cached_Policies.h" -#include "tao/PortableServer/ThreadStrategy.h" -#include "tao/PortableServer/ThreadStrategyFactory.h" -#include "tao/PortableServer/RequestProcessingStrategy.h" -#include "tao/PortableServer/RequestProcessingStrategyFactory.h" -#include "tao/PortableServer/IdAssignmentStrategy.h" -#include "tao/PortableServer/IdAssignmentStrategyFactory.h" -#include "tao/PortableServer/LifespanStrategy.h" -#include "tao/PortableServer/LifespanStrategyFactory.h" -#include "tao/PortableServer/IdUniquenessStrategy.h" -#include "tao/PortableServer/IdUniquenessStrategyFactory.h" -#include "tao/PortableServer/ImplicitActivationStrategy.h" -#include "tao/PortableServer/ImplicitActivationStrategyFactory.h" -#include "tao/PortableServer/ServantRetentionStrategy.h" -#include "tao/PortableServer/ServantRetentionStrategyFactory.h" - -#include "tao/PortableServer/IdAssignmentPolicyC.h" -#include "tao/PortableServer/IdUniquenessPolicyC.h" -#include "tao/PortableServer/ImplicitActivationPolicyC.h" -#include "tao/PortableServer/LifespanPolicyC.h" -#include "tao/PortableServer/RequestProcessingPolicyC.h" -#include "tao/PortableServer/ServantRetentionPolicyC.h" -#include "tao/PortableServer/ThreadPolicyC.h" -#include "tao/PortableServer/ServantRetentionPolicyC.h" - -#include "ace/Dynamic_Service.h" +#include "tao/PortableServer/ThreadStrategySingle.h" +#include "tao/PortableServer/ThreadStrategyORBControl.h" +#include "tao/PortableServer/IdAssignmentStrategySystem.h" +#include "tao/PortableServer/IdAssignmentStrategyUser.h" +#include "tao/PortableServer/IdUniquenessStrategyMultiple.h" +#include "tao/PortableServer/IdUniquenessStrategyUnique.h" +#include "tao/PortableServer/ImplicitActivationStrategyExplicit.h" +#include "tao/PortableServer/ImplicitActivationStrategyImplicit.h" +#include "tao/PortableServer/LifespanStrategyPersistent.h" +#include "tao/PortableServer/LifespanStrategyTransient.h" +#include "tao/PortableServer/RequestProcessingStrategyAOMOnly.h" +#include "tao/PortableServer/RequestProcessingStrategyDefaultServant.h" +#include "tao/PortableServer/RequestProcessingStrategyServantLocator.h" +#include "tao/PortableServer/RequestProcessingStrategyServantActivator.h" +#include "tao/PortableServer/ServantRetentionStrategyNonRetain.h" +#include "tao/PortableServer/ServantRetentionStrategyRetain.h" #if !defined (__ACE_INLINE__) # include "tao/PortableServer/Active_Policy_Strategies.inl" @@ -38,91 +29,19 @@ namespace TAO { namespace Portable_Server { - Active_Policy_Strategies::Active_Policy_Strategies () - : thread_strategy_ (0), - request_processing_strategy_ (0), - id_assignment_strategy_ (0), - lifespan_strategy_ (0), - id_uniqueness_strategy_ (0), - implicit_activation_strategy_ (0), - servant_retention_strategy_ (0), - thread_strategy_factory_ (0), - servant_retention_strategy_factory_ (0), - request_processing_strategy_factory_ (0), - lifespan_strategy_factory_ (0), - implicit_activation_strategy_factory_ (0), - id_uniqueness_strategy_factory_ (0), - id_assignment_strategy_factory_ (0) - { - } - void Active_Policy_Strategies::update (Cached_Policies &policies, ::TAO_Root_POA *poa) { - this->thread_strategy_factory_ = - ACE_Dynamic_Service::instance ("ThreadStrategyFactory"); - - if (this->thread_strategy_factory_ != 0) - this->thread_strategy_ = - this->thread_strategy_factory_->create (policies.thread()); + this->create (policies.thread()); + this->create (policies.id_assignment()); + this->create (policies.id_uniqueness()); + this->create (policies.servant_retention()); + this->create (policies.lifespan()); + this->create (policies.implicit_activation()); + this->create (policies.request_processing(), policies.servant_retention()); /**/ - - this->id_assignment_strategy_factory_ = - ACE_Dynamic_Service::instance ("IdAssignmentStrategyFactory"); - - if (this->id_assignment_strategy_factory_ != 0) - this->id_assignment_strategy_ = - this->id_assignment_strategy_factory_->create (policies.id_assignment()); - - /**/ - - this->id_uniqueness_strategy_factory_ = - ACE_Dynamic_Service::instance ("IdUniquenessStrategyFactory"); - - if (this->id_uniqueness_strategy_factory_ != 0) - this->id_uniqueness_strategy_ = - this->id_uniqueness_strategy_factory_->create (policies.id_uniqueness()); - - /**/ - - this->servant_retention_strategy_factory_ = - ACE_Dynamic_Service::instance ("ServantRetentionStrategyFactory"); - - if (this->servant_retention_strategy_factory_ != 0) - this->servant_retention_strategy_ = - this->servant_retention_strategy_factory_->create (policies.servant_retention()); - - /**/ - - this->request_processing_strategy_factory_ = - ACE_Dynamic_Service::instance ("RequestProcessingStrategyFactory"); - - if (this->request_processing_strategy_factory_ != 0) - this->request_processing_strategy_ = - this->request_processing_strategy_factory_->create (policies.request_processing(), policies.servant_retention()); - - /**/ - - this->lifespan_strategy_factory_ = - ACE_Dynamic_Service::instance ("LifespanStrategyFactory"); - - if (this->lifespan_strategy_factory_ != 0) - this->lifespan_strategy_ = - this->lifespan_strategy_factory_->create (policies.lifespan()); - - /**/ - - this->implicit_activation_strategy_factory_ = - ACE_Dynamic_Service::instance ("ImplicitActivationStrategyFactory"); - - if (this->implicit_activation_strategy_factory_ != 0) - this->implicit_activation_strategy_ = - this->implicit_activation_strategy_factory_->create (policies.implicit_activation()); - - /**/ - if (this->lifespan_strategy_ != 0) { this->lifespan_strategy_->strategy_init (poa); @@ -130,7 +49,7 @@ namespace TAO if (this->request_processing_strategy_ != 0) { - this->request_processing_strategy_->strategy_init (poa, policies.servant_retention()); + this->request_processing_strategy_->strategy_init (poa); } if (this->id_uniqueness_strategy_ != 0) @@ -138,78 +57,189 @@ namespace TAO this->id_uniqueness_strategy_->strategy_init (poa); } - if (this->implicit_activation_strategy_ != 0) + if (this->servant_retention_strategy_ != 0) { - this->implicit_activation_strategy_->strategy_init (poa); + this->servant_retention_strategy_->strategy_init (poa); } + } + + void + Active_Policy_Strategies::cleanup () + { + this->lifespan_strategy_->strategy_cleanup (); + this->lifespan_strategy_.reset (nullptr); + this->request_processing_strategy_->strategy_cleanup (); + this->request_processing_strategy_.reset (nullptr); + this->id_uniqueness_strategy_->strategy_cleanup (); + this->id_uniqueness_strategy_.reset (nullptr); + this->implicit_activation_strategy_.reset (nullptr); + this->thread_strategy_.reset (nullptr); + this->servant_retention_strategy_->strategy_cleanup (); + this->servant_retention_strategy_.reset (nullptr); + this->id_assignment_strategy_.reset (nullptr); + } - if (this->thread_strategy_ != 0) + void + Active_Policy_Strategies::create (::PortableServer::ThreadPolicyValue value) + { + switch (value) + { + case ::PortableServer::SINGLE_THREAD_MODEL : { - this->thread_strategy_->strategy_init (poa); +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_MICRO) && !defined (CORBA_E_COMPACT) + this->thread_strategy_.reset (new ThreadStrategySingle ()); +#endif /* TAO_HAS_MINIMUM_POA == 0 */ + break; } - - if (this->servant_retention_strategy_ != 0) + case ::PortableServer::ORB_CTRL_MODEL : { - this->servant_retention_strategy_->strategy_init (poa); + this->thread_strategy_.reset (new ThreadStrategyORBControl ()); + break; } + } + } - if (this->id_assignment_strategy_ != 0) + void + Active_Policy_Strategies::create (::PortableServer::IdAssignmentPolicyValue value) + { + switch (value) + { + case ::PortableServer::SYSTEM_ID : + { + this->id_assignment_strategy_.reset (new IdAssignmentStrategySystem ()); + break; + } + case ::PortableServer::USER_ID : { - this->id_assignment_strategy_->strategy_init (poa); +#if !defined (CORBA_E_MICRO) + this->id_assignment_strategy_.reset (new IdAssignmentStrategyUser ()); +#endif /* CORBA_E_MICRO */ + break; } + } } void - Active_Policy_Strategies::cleanup () + Active_Policy_Strategies::create (::PortableServer::IdUniquenessPolicyValue value) { - if (this->lifespan_strategy_ != 0) + switch (value) + { + case ::PortableServer::MULTIPLE_ID : { - this->lifespan_strategy_factory_->destroy (lifespan_strategy_); - - this->lifespan_strategy_ = 0; +#if !defined (CORBA_E_MICRO) + this->id_uniqueness_strategy_.reset (new IdUniquenessStrategyMultiple ()); +#endif /* CORBA_E_MICRO */ + break; } - - if (this->request_processing_strategy_ != 0) + case ::PortableServer::UNIQUE_ID : { - this->request_processing_strategy_factory_->destroy (request_processing_strategy_); - - this->request_processing_strategy_ = 0; + this->id_uniqueness_strategy_.reset (new IdUniquenessStrategyUnique ()); + break; } + } + } - if (this->id_uniqueness_strategy_ != 0) + void + Active_Policy_Strategies::create (::PortableServer::ServantRetentionPolicyValue value) + { + switch (value) + { + case ::PortableServer::RETAIN : { - this->id_uniqueness_strategy_factory_->destroy (id_uniqueness_strategy_); - - this->id_uniqueness_strategy_ = 0; + this->servant_retention_strategy_.reset (new ServantRetentionStrategyRetain ()); + break; } - - if (this->implicit_activation_strategy_ != 0) + case ::PortableServer::NON_RETAIN : { - this->implicit_activation_strategy_factory_->destroy (implicit_activation_strategy_); - - this->implicit_activation_strategy_ = 0; +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_MICRO) && !defined (CORBA_E_COMPACT) + this->servant_retention_strategy_.reset (new ServantRetentionStrategyNonRetain ()); +#endif /* TAO_HAS_MINIMUM_POA == 0 */ + break; } + } + } - if (this->thread_strategy_ != 0) + void + Active_Policy_Strategies::create (::PortableServer::LifespanPolicyValue value) + { + switch (value) + { + case ::PortableServer::PERSISTENT : { - this->thread_strategy_factory_->destroy (thread_strategy_); - - this->thread_strategy_ = 0; +#if !defined (CORBA_E_MICRO) + this->lifespan_strategy_.reset (new LifespanStrategyPersistent ()); +#endif /* CORBA_E_MICRO */ + break; } - - if (this->servant_retention_strategy_ != 0) + case ::PortableServer::TRANSIENT : { - this->servant_retention_strategy_factory_->destroy (servant_retention_strategy_); - - this->servant_retention_strategy_ = 0; + this->lifespan_strategy_.reset (new LifespanStrategyTransient ()); + break; } + } + } - if (this->id_assignment_strategy_ != 0) + void + Active_Policy_Strategies::create (::PortableServer::ImplicitActivationPolicyValue value) + { + switch (value) + { + case ::PortableServer::IMPLICIT_ACTIVATION : + { +#if !defined (CORBA_E_MICRO) && !defined (CORBA_E_COMPACT) + this->implicit_activation_strategy_.reset (new ImplicitActivationStrategyImplicit ()); +#endif /* CORBA_E_MICRO */ + break; + } + case ::PortableServer::NO_IMPLICIT_ACTIVATION : { - this->id_assignment_strategy_factory_->destroy (id_assignment_strategy_); + this->implicit_activation_strategy_.reset (new ImplicitActivationStrategyExplicit ()); + break; + } + } + } - this->id_assignment_strategy_ = 0; + void + Active_Policy_Strategies::create ( + ::PortableServer::RequestProcessingPolicyValue value, + ::PortableServer::ServantRetentionPolicyValue srvalue) + { + switch (value) + { + case ::PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY : + { + this->request_processing_strategy_.reset (new RequestProcessingStrategyAOMOnly ()); + break; + } + case ::PortableServer::USE_DEFAULT_SERVANT : + { +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) + this->request_processing_strategy_.reset (new RequestProcessingStrategyDefaultServant ()); +#endif /* TAO_HAS_MINIMUM_POA == 0 */ + break; + } + case ::PortableServer::USE_SERVANT_MANAGER : + { + switch (srvalue) + { + case ::PortableServer::RETAIN : + { +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) + this->request_processing_strategy_.reset (new RequestProcessingStrategyServantActivator ()); +#endif /* TAO_HAS_MINIMUM_POA == 0 */ + break; + } + case ::PortableServer::NON_RETAIN : + { +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) + this->request_processing_strategy_.reset (new RequestProcessingStrategyServantLocator ()); +#endif /* TAO_HAS_MINIMUM_POA == 0 */ + break; + } + } + break; } + } } } } diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.h b/TAO/tao/PortableServer/Active_Policy_Strategies.h index b683ed244eb..f05fbba535c 100644 --- a/TAO/tao/PortableServer/Active_Policy_Strategies.h +++ b/TAO/tao/PortableServer/Active_Policy_Strategies.h @@ -14,11 +14,20 @@ #include /**/ "ace/pre.h" #include "tao/orbconf.h" +#include #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/PortableServer/ThreadPolicyC.h" +#include "tao/PortableServer/IdAssignmentPolicyC.h" +#include "tao/PortableServer/IdUniquenessPolicyC.h" +#include "tao/PortableServer/ServantRetentionPolicyC.h" +#include "tao/PortableServer/LifespanPolicyC.h" +#include "tao/PortableServer/ImplicitActivationPolicyC.h" +#include "tao/PortableServer/RequestProcessingPolicyC.h" + TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Root_POA; @@ -36,24 +45,15 @@ namespace TAO class ImplicitActivationStrategy; class ServantRetentionStrategy; - class ThreadStrategyFactory; - class ServantRetentionStrategyFactory; - class RequestProcessingStrategyFactory; - class LifespanStrategyFactory; - class ImplicitActivationStrategyFactory; - class IdUniquenessStrategyFactory; - class IdAssignmentStrategyFactory; - /** * This class stores the active policy strategies used for a certain POA. */ class Active_Policy_Strategies { public: - Active_Policy_Strategies (); + Active_Policy_Strategies () = default; - void update (Cached_Policies &policies, - TAO_Root_POA* poa); + void update (Cached_Policies &policies, TAO_Root_POA* poa); void cleanup (); @@ -72,21 +72,22 @@ namespace TAO ServantRetentionStrategy *servant_retention_strategy () const; private: - ThreadStrategy *thread_strategy_; - RequestProcessingStrategy *request_processing_strategy_; - IdAssignmentStrategy *id_assignment_strategy_; - LifespanStrategy *lifespan_strategy_; - IdUniquenessStrategy *id_uniqueness_strategy_; - ImplicitActivationStrategy *implicit_activation_strategy_; - ServantRetentionStrategy *servant_retention_strategy_; - - ThreadStrategyFactory *thread_strategy_factory_; - ServantRetentionStrategyFactory *servant_retention_strategy_factory_; - RequestProcessingStrategyFactory *request_processing_strategy_factory_; - LifespanStrategyFactory *lifespan_strategy_factory_; - ImplicitActivationStrategyFactory *implicit_activation_strategy_factory_; - IdUniquenessStrategyFactory *id_uniqueness_strategy_factory_; - IdAssignmentStrategyFactory *id_assignment_strategy_factory_; + void create (::PortableServer::ThreadPolicyValue value); + void create (::PortableServer::IdAssignmentPolicyValue value); + void create (::PortableServer::IdUniquenessPolicyValue value); + void create (::PortableServer::ServantRetentionPolicyValue value); + void create (::PortableServer::LifespanPolicyValue value); + void create (::PortableServer::ImplicitActivationPolicyValue value); + void create (::PortableServer::RequestProcessingPolicyValue value, ::PortableServer::ServantRetentionPolicyValue srvalue); + + private: + std::unique_ptr thread_strategy_ {}; + std::unique_ptr id_assignment_strategy_ {}; + std::unique_ptr id_uniqueness_strategy_ {}; + std::unique_ptr servant_retention_strategy_ {}; + std::unique_ptr lifespan_strategy_ {}; + std::unique_ptr implicit_activation_strategy_ {}; + std::unique_ptr request_processing_strategy_ {}; }; /** @@ -96,6 +97,7 @@ namespace TAO class Active_Policy_Strategies_Cleanup_Guard { public: + Active_Policy_Strategies_Cleanup_Guard () = delete; Active_Policy_Strategies_Cleanup_Guard (Active_Policy_Strategies *p); ~Active_Policy_Strategies_Cleanup_Guard (); diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.inl b/TAO/tao/PortableServer/Active_Policy_Strategies.inl index b28b53ea4a5..0f1e51fb0eb 100644 --- a/TAO/tao/PortableServer/Active_Policy_Strategies.inl +++ b/TAO/tao/PortableServer/Active_Policy_Strategies.inl @@ -9,49 +9,49 @@ namespace TAO ThreadStrategy* Active_Policy_Strategies::thread_strategy () const { - return this->thread_strategy_; + return this->thread_strategy_.get (); } ACE_INLINE RequestProcessingStrategy* Active_Policy_Strategies::request_processing_strategy () const { - return this->request_processing_strategy_; + return this->request_processing_strategy_.get (); } ACE_INLINE IdAssignmentStrategy * Active_Policy_Strategies::id_assignment_strategy () const { - return this->id_assignment_strategy_; + return this->id_assignment_strategy_. get (); } ACE_INLINE IdUniquenessStrategy * Active_Policy_Strategies::id_uniqueness_strategy () const { - return this->id_uniqueness_strategy_; + return this->id_uniqueness_strategy_.get (); } ACE_INLINE LifespanStrategy* Active_Policy_Strategies::lifespan_strategy () const { - return this->lifespan_strategy_; + return this->lifespan_strategy_. get(); } ACE_INLINE ImplicitActivationStrategy* Active_Policy_Strategies::implicit_activation_strategy () const { - return this->implicit_activation_strategy_; + return this->implicit_activation_strategy_.get (); } ACE_INLINE ServantRetentionStrategy* Active_Policy_Strategies::servant_retention_strategy () const { - return this->servant_retention_strategy_; + return this->servant_retention_strategy_.get (); } ACE_INLINE @@ -76,7 +76,7 @@ namespace TAO Active_Policy_Strategies_Cleanup_Guard::_retn () { Active_Policy_Strategies *temp = this->ptr_; - this->ptr_ = 0; + this->ptr_ = nullptr; return temp; } } diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.h b/TAO/tao/PortableServer/Default_Servant_Dispatcher.h index a77043c28d2..d4d6a333a86 100644 --- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.h +++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.h @@ -8,8 +8,8 @@ */ //============================================================================= -#ifndef TAO_DEFAULT_SERVANT_DISPATCHER_H -#define TAO_DEFAULT_SERVANT_DISPATCHER_H +#ifndef Default_Servant_DISPATCHER_H +#define Default_Servant_DISPATCHER_H #include /**/ "ace/pre.h" #include "tao/PortableServer/portableserver_export.h" @@ -68,4 +68,4 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" -#endif /* TAO_DEFAULT_SERVANT_DISPATCHER_H */ +#endif /* Default_Servant_DISPATCHER_H */ diff --git a/TAO/tao/PortableServer/IdAssignmentPolicy.h b/TAO/tao/PortableServer/IdAssignmentPolicy.h index 82686e026dc..bef8f68e0b5 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicy.h +++ b/TAO/tao/PortableServer/IdAssignmentPolicy.h @@ -52,10 +52,10 @@ namespace TAO CORBA::PolicyType policy_type (); /// Return the cached policy type for this policy. - virtual TAO_Cached_Policy_Type _tao_cached_type () const; + TAO_Cached_Policy_Type _tao_cached_type () const override; /// Returns the scope at which this policy can be applied. See orbconf.h. - virtual TAO_Policy_Scope _tao_scope () const; + TAO_Policy_Scope _tao_scope () const override; private: ::PortableServer::IdAssignmentPolicyValue value_; diff --git a/TAO/tao/PortableServer/IdAssignmentStrategy.cpp b/TAO/tao/PortableServer/IdAssignmentStrategy.cpp index 100a129d208..bd03e9693d6 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategy.cpp +++ b/TAO/tao/PortableServer/IdAssignmentStrategy.cpp @@ -6,16 +6,6 @@ namespace TAO { namespace Portable_Server { - void - IdAssignmentStrategy::strategy_init (TAO_Root_POA * /*poa*/) - { - } - - void - IdAssignmentStrategy::strategy_cleanup() - { - } - char IdAssignmentStrategy::key_type_length () const { diff --git a/TAO/tao/PortableServer/IdAssignmentStrategy.h b/TAO/tao/PortableServer/IdAssignmentStrategy.h index dca18216db1..5f4e1ce6e5f 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategy.h +++ b/TAO/tao/PortableServer/IdAssignmentStrategy.h @@ -12,14 +12,12 @@ #define TAO_ID_ASSIGNMENT_STRATEGY_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/Policy_Strategy.h" +#include "tao/Basic_Types.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Basic_Types.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO @@ -27,12 +25,10 @@ namespace TAO namespace Portable_Server { class IdAssignmentStrategy - : public Policy_Strategy { public: - virtual void strategy_init(TAO_Root_POA *poa); - - virtual void strategy_cleanup(); + IdAssignmentStrategy () = default; + virtual ~IdAssignmentStrategy () = default; /** * Returns the key type the says which specific policy we have diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyFactory.h b/TAO/tao/PortableServer/IdAssignmentStrategyFactory.h deleted file mode 100644 index ceab91a8dc7..00000000000 --- a/TAO/tao/PortableServer/IdAssignmentStrategyFactory.h +++ /dev/null @@ -1,47 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file IdAssignmentStrategyFactory.h - * - * @author Johnny Willemsen - */ -//============================================================================= - -#ifndef TAO_PORTABLESERVER_IDASSIGNMENTSTRATEGYFACTORY_H -#define TAO_PORTABLESERVER_IDASSIGNMENTSTRATEGYFACTORY_H -#include /**/ "ace/pre.h" - -#include "tao/PortableServer/portableserver_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/PortableServer/StrategyFactory.h" -#include "tao/PortableServer/IdAssignmentPolicyC.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace Portable_Server - { - class IdAssignmentStrategy; - - class TAO_PortableServer_Export IdAssignmentStrategyFactory - : public StrategyFactory - { - public: - /// Create a new servant retention strategy - virtual IdAssignmentStrategy* create (::PortableServer::IdAssignmentPolicyValue value) = 0; - - virtual void destroy (IdAssignmentStrategy *strategy) = 0; - }; - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#include /**/ "ace/post.h" -#endif /* TAO_PORTABLESERVER_IDASSIGNMENTSTRATEGYFACTORY_H */ diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp deleted file mode 100644 index e2d04886b10..00000000000 --- a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp +++ /dev/null @@ -1,64 +0,0 @@ -#include "tao/PortableServer/IdAssignmentStrategyFactoryImpl.h" -#include "tao/PortableServer/IdAssignmentStrategy.h" -#include "ace/Dynamic_Service.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace Portable_Server - { - IdAssignmentStrategy * - IdAssignmentStrategyFactoryImpl::create ( - ::PortableServer::IdAssignmentPolicyValue value) - { - IdAssignmentStrategy *strategy = 0; - const char *strategy_name = 0; - - switch (value) - { - case ::PortableServer::SYSTEM_ID : - { - strategy_name = "IdAssignmentStrategySystem"; - break; - } - case ::PortableServer::USER_ID : - { - strategy_name = "IdAssignmentStrategyUser"; - break; - } - } - - strategy = - ACE_Dynamic_Service ::instance (strategy_name); - - if (strategy == 0) - TAOLIB_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) ERROR, Unable to get %C\n"), - strategy_name)); - - return strategy; - } - - void - IdAssignmentStrategyFactoryImpl::destroy (IdAssignmentStrategy *) - { - // Noop because both types are singletons - } - - } -} - -ACE_STATIC_SVC_DEFINE ( - IdAssignmentStrategyFactoryImpl, - ACE_TEXT ("IdAssignmentStrategyFactory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (IdAssignmentStrategyFactoryImpl), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) - -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - IdAssignmentStrategyFactoryImpl, - TAO::Portable_Server::IdAssignmentStrategyFactoryImpl) -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h deleted file mode 100644 index d0f64224202..00000000000 --- a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h +++ /dev/null @@ -1,49 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file IdAssignmentStrategyFactoryImpl.h - * - * @author Johnny Willemsen - */ -//============================================================================= - -#ifndef TAO_PORTABLESERVER_IDASSIGNMENTSTRATEGYFACTORYIMPL_H -#define TAO_PORTABLESERVER_IDASSIGNMENTSTRATEGYFACTORYIMPL_H -#include /**/ "ace/pre.h" - -#include "tao/PortableServer/portableserver_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/PortableServer/IdAssignmentStrategyFactory.h" -#include "ace/Service_Config.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace Portable_Server - { - class TAO_PortableServer_Export IdAssignmentStrategyFactoryImpl - : public IdAssignmentStrategyFactory - { - public: - /// Create a new servant retention strategy - virtual IdAssignmentStrategy* create (::PortableServer::IdAssignmentPolicyValue value); - - virtual void destroy (IdAssignmentStrategy *strategy); - }; - } -} - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdAssignmentStrategyFactoryImpl) -ACE_FACTORY_DECLARE (TAO_PortableServer, IdAssignmentStrategyFactoryImpl) - -TAO_END_VERSIONED_NAMESPACE_DECL - -#include /**/ "ace/post.h" - -#endif /* TAO_PORTABLESERVER_IDASSIGNMENTSTRATEGYFACTORYIMPL_H */ diff --git a/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp b/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp index 30d87e69e9f..49c84bd15b3 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp +++ b/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp @@ -21,18 +21,5 @@ namespace TAO } } -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - IdAssignmentStrategySystem, - TAO::Portable_Server::IdAssignmentStrategySystem) - -ACE_STATIC_SVC_DEFINE ( - IdAssignmentStrategySystem, - ACE_TEXT ("IdAssignmentStrategySystem"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (IdAssignmentStrategySystem), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) - TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/IdAssignmentStrategySystem.h b/TAO/tao/PortableServer/IdAssignmentStrategySystem.h index 7ee2acb36f4..8b05e5b8eca 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategySystem.h +++ b/TAO/tao/PortableServer/IdAssignmentStrategySystem.h @@ -12,35 +12,28 @@ #define TAO_IDASSIGNMENTSTRATEGYSYSTEM_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "tao/PortableServer/IdAssignmentStrategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/IdAssignmentStrategy.h" -#include "ace/Service_Config.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { namespace Portable_Server { - class IdAssignmentStrategySystem - : public IdAssignmentStrategy + class IdAssignmentStrategySystem : public IdAssignmentStrategy { public: - virtual char id_assignment_key_type () const; + char id_assignment_key_type () const override; - virtual bool has_system_id () const; + bool has_system_id () const override; }; } } -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdAssignmentStrategySystem) -ACE_FACTORY_DECLARE (TAO_PortableServer, IdAssignmentStrategySystem) - TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp b/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp index 622dbd3f4ef..1b6f8064d42 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp +++ b/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp @@ -20,17 +20,4 @@ namespace TAO } } -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - IdAssignmentStrategyUser, - TAO::Portable_Server::IdAssignmentStrategyUser) - -ACE_STATIC_SVC_DEFINE ( - IdAssignmentStrategyUser, - ACE_TEXT ("IdAssignmentStrategyUser"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (IdAssignmentStrategyUser), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) - TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyUser.h b/TAO/tao/PortableServer/IdAssignmentStrategyUser.h index c64be097bce..49898a8b581 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategyUser.h +++ b/TAO/tao/PortableServer/IdAssignmentStrategyUser.h @@ -12,35 +12,28 @@ #define TAO_IDASSIGNMENTSTRATEGYUSER_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "tao/PortableServer/IdAssignmentStrategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/IdAssignmentStrategy.h" -#include "ace/Service_Config.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { namespace Portable_Server { - class IdAssignmentStrategyUser - : public IdAssignmentStrategy + class IdAssignmentStrategyUser : public IdAssignmentStrategy { public: - virtual char id_assignment_key_type () const; + char id_assignment_key_type () const override; - virtual bool has_system_id () const; + bool has_system_id () const override; }; } } -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdAssignmentStrategyUser) -ACE_FACTORY_DECLARE (TAO_PortableServer, IdAssignmentStrategyUser) - TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.cpp b/TAO/tao/PortableServer/IdUniquenessPolicy.cpp index ce0297809b5..97a312289aa 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicy.cpp +++ b/TAO/tao/PortableServer/IdUniquenessPolicy.cpp @@ -21,7 +21,7 @@ namespace TAO CORBA::Policy_ptr IdUniquenessPolicy::copy () { - IdUniquenessPolicy *copy = 0; + IdUniquenessPolicy *copy = nullptr; ACE_NEW_THROW_EX (copy, IdUniquenessPolicy (this->value_), CORBA::NO_MEMORY ()); diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.h b/TAO/tao/PortableServer/IdUniquenessPolicy.h index 3ecbf3b3492..3cf26325ac5 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicy.h +++ b/TAO/tao/PortableServer/IdUniquenessPolicy.h @@ -52,10 +52,10 @@ namespace TAO CORBA::PolicyType policy_type (); /// Return the cached policy type for this policy. - virtual TAO_Cached_Policy_Type _tao_cached_type () const; + TAO_Cached_Policy_Type _tao_cached_type () const override; /// Returns the scope at which this policy can be applied. See orbconf.h. - virtual TAO_Policy_Scope _tao_scope () const; + TAO_Policy_Scope _tao_scope () const override; private: ::PortableServer::IdUniquenessPolicyValue value_; diff --git a/TAO/tao/PortableServer/IdUniquenessStrategy.cpp b/TAO/tao/PortableServer/IdUniquenessStrategy.cpp new file mode 100644 index 00000000000..caa7602057b --- /dev/null +++ b/TAO/tao/PortableServer/IdUniquenessStrategy.cpp @@ -0,0 +1,23 @@ +// -*- C++ -*- + +//============================================================================= +/** + * @file IdUniquenessStrategy.cpp + */ +//============================================================================= + +#include "tao/PortableServer/IdUniquenessStrategy.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +namespace TAO +{ + namespace Portable_Server + { + IdUniquenessStrategy::IdUniquenessStrategy () + { + } + } /* namespace Portable_Server */ +} /* namespace TAO */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/IdUniquenessStrategy.h b/TAO/tao/PortableServer/IdUniquenessStrategy.h index b3372d94343..7098f64e59e 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategy.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategy.h @@ -12,14 +12,12 @@ #define TAO_ID_UNIQUENESS_STRATEGY_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "tao/PortableServer/IdUniquenessPolicyC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/Policy_Strategy.h" -#include "tao/PortableServer/IdUniquenessPolicyC.h" #include "tao/PortableServer/PS_ForwardC.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -28,22 +26,24 @@ namespace TAO { namespace Portable_Server { - class TAO_PortableServer_Export IdUniquenessStrategy - : public Policy_Strategy + class IdUniquenessStrategy { public: + IdUniquenessStrategy (); + virtual ~IdUniquenessStrategy () = default; + + virtual void strategy_init (TAO_Root_POA *poa); + + virtual void strategy_cleanup (); + /* * Validate if the servant may be activated * @retval true This servant may be activated * @retval false This servant may not be activated */ - virtual bool is_servant_activation_allowed ( - PortableServer::Servant s, - bool &w) = 0; + virtual bool is_servant_activation_allowed (PortableServer::Servant s, bool &w) = 0; virtual bool allow_multiple_activations () const = 0; - - virtual ::PortableServer::IdUniquenessPolicyValue type() const = 0; }; } } diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyFactory.h b/TAO/tao/PortableServer/IdUniquenessStrategyFactory.h deleted file mode 100644 index c01c47fee41..00000000000 --- a/TAO/tao/PortableServer/IdUniquenessStrategyFactory.h +++ /dev/null @@ -1,48 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file IdUniquenessStrategyFactory.h - * - * @author Johnny Willemsen - */ -//============================================================================= - -#ifndef TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYFACTORY_H -#define TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYFACTORY_H -#include /**/ "ace/pre.h" - -#include "tao/PortableServer/portableserver_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/PortableServer/StrategyFactory.h" -#include "tao/PortableServer/IdUniquenessPolicyC.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace Portable_Server - { - class IdUniquenessStrategy; - - class TAO_PortableServer_Export IdUniquenessStrategyFactory - : public StrategyFactory - { - public: - /// Create a new servant retention strategy - virtual IdUniquenessStrategy* create (::PortableServer::IdUniquenessPolicyValue value) = 0; - - /// Cleanup the given strategy instance - virtual void destroy (IdUniquenessStrategy *strategy) = 0; - }; - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#include /**/ "ace/post.h" -#endif /* TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYFACTORY_H */ diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp deleted file mode 100644 index f215d512ae1..00000000000 --- a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp +++ /dev/null @@ -1,93 +0,0 @@ -#include "tao/PortableServer/IdUniquenessStrategyFactoryImpl.h" -#include "tao/PortableServer/IdUniquenessStrategy.h" -#include "ace/Dynamic_Service.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace Portable_Server - { - IdUniquenessStrategy* - IdUniquenessStrategyFactoryImpl::create ( - ::PortableServer::IdUniquenessPolicyValue value) - { - IdUniquenessStrategy* strategy = 0; - switch (value) - { - case ::PortableServer::MULTIPLE_ID : - { - strategy = - ACE_Dynamic_Service::instance ("IdUniquenessStrategyMultiple"); - - if (strategy == 0) - TAOLIB_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) %p\n"), - ACE_TEXT ("ERROR, Unable to get ") - ACE_TEXT ("IdUniquenessStrategyMultiple"))); - - break; - } - case ::PortableServer::UNIQUE_ID : - { - IdUniquenessStrategyFactory *strategy_factory = - ACE_Dynamic_Service::instance ("IdUniquenessStrategyUniqueFactory"); - - if (strategy_factory != 0) - strategy = strategy_factory->create (value); - else - TAOLIB_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) %p\n"), - ACE_TEXT ("ERROR, Unable to get ") - ACE_TEXT ("IdUniquenessStrategyUniqueFactory"))); - - break; - } - } - - return strategy; - } - - void - IdUniquenessStrategyFactoryImpl::destroy ( - IdUniquenessStrategy *strategy) - { - switch (strategy->type ()) - { - case ::PortableServer::MULTIPLE_ID : - { - // Noop - break; - } - case ::PortableServer::UNIQUE_ID : - { - IdUniquenessStrategyFactory *strategy_factory = - ACE_Dynamic_Service::instance ("IdUniquenessStrategyUniqueFactory"); - - if (strategy_factory != 0) - { - strategy_factory->destroy (strategy); - } - break; - } - } - } - - } -} - -ACE_STATIC_SVC_DEFINE ( - IdUniquenessStrategyFactoryImpl, - ACE_TEXT ("IdUniquenessStrategyFactory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (IdUniquenessStrategyFactoryImpl), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) - -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - IdUniquenessStrategyFactoryImpl, - TAO::Portable_Server::IdUniquenessStrategyFactoryImpl) - -TAO_END_VERSIONED_NAMESPACE_DECL - diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h deleted file mode 100644 index 8c869ab0ab9..00000000000 --- a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h +++ /dev/null @@ -1,48 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file IdUniquenessStrategyFactoryImpl.h - * - * @author Johnny Willemsen - */ -//============================================================================= - -#ifndef TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYFACTORYIMPL_H -#define TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYFACTORYIMPL_H -#include /**/ "ace/pre.h" - -#include "tao/PortableServer/portableserver_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Service_Config.h" -#include "tao/PortableServer/IdUniquenessStrategyFactory.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace Portable_Server - { - class TAO_PortableServer_Export IdUniquenessStrategyFactoryImpl - : public IdUniquenessStrategyFactory - { - public: - /// Create a new servant retention strategy - virtual IdUniquenessStrategy* create (::PortableServer::IdUniquenessPolicyValue value); - - virtual void destroy (IdUniquenessStrategy *strategy); - }; - } -} - -ACE_STATIC_SVC_DECLARE (IdUniquenessStrategyFactoryImpl) -ACE_FACTORY_DECLARE (TAO_PortableServer, IdUniquenessStrategyFactoryImpl) - -TAO_END_VERSIONED_NAMESPACE_DECL - -#include /**/ "ace/post.h" -#endif /* TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYFACTORYIMPL_H */ diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp index 170d4a18643..cfcdd9fb672 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp +++ b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp @@ -32,27 +32,7 @@ namespace TAO { return true; } - - ::PortableServer::IdUniquenessPolicyValue - IdUniquenessStrategyMultiple::type () const - { - return ::PortableServer::MULTIPLE_ID; - } - } } -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - IdUniquenessStrategyMultiple, - TAO::Portable_Server::IdUniquenessStrategyMultiple) - -ACE_STATIC_SVC_DEFINE ( - IdUniquenessStrategyMultiple, - ACE_TEXT ("IdUniquenessStrategyMultiple"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (IdUniquenessStrategyMultiple), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) TAO_END_VERSIONED_NAMESPACE_DECL - diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h index 15e212c64ab..15831b56c31 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h @@ -12,43 +12,32 @@ #define TAO_ID_UNIQUENESSSTRATEGY_MULITPLE_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "tao/PortableServer/IdUniquenessStrategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/IdUniquenessStrategy.h" -#include "ace/Service_Config.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { namespace Portable_Server { - class TAO_PortableServer_Export IdUniquenessStrategyMultiple - : public IdUniquenessStrategy + class IdUniquenessStrategyMultiple : public IdUniquenessStrategy { public: - virtual void strategy_init (TAO_Root_POA *poa); + void strategy_init (TAO_Root_POA *poa) override; - virtual void strategy_cleanup (); + void strategy_cleanup () override; - virtual bool is_servant_activation_allowed ( - PortableServer::Servant servant, - bool &w); + bool is_servant_activation_allowed (PortableServer::Servant servant, bool &w) override; - virtual bool allow_multiple_activations () const; - - virtual ::PortableServer::IdUniquenessPolicyValue type() const; + bool allow_multiple_activations () const override; }; } } -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdUniquenessStrategyMultiple) -ACE_FACTORY_DECLARE (TAO_PortableServer, IdUniquenessStrategyMultiple) - TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp index c805fabf79d..eb890598218 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp @@ -7,11 +7,6 @@ namespace TAO { namespace Portable_Server { - IdUniquenessStrategyUnique::IdUniquenessStrategyUnique () : - poa_ (0) - { - } - void IdUniquenessStrategyUnique::strategy_init ( TAO_Root_POA *poa) @@ -22,7 +17,7 @@ namespace TAO void IdUniquenessStrategyUnique::strategy_cleanup () { - poa_ = 0; + poa_ = nullptr; } bool @@ -44,28 +39,8 @@ namespace TAO { return false; } - - ::PortableServer::IdUniquenessPolicyValue - IdUniquenessStrategyUnique::type() const - { - return ::PortableServer::UNIQUE_ID; - } - } } -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - IdUniquenessStrategyUnique, - TAO::Portable_Server::IdUniquenessStrategyUnique) - -ACE_STATIC_SVC_DEFINE ( - IdUniquenessStrategyUnique, - ACE_TEXT ("IdUniquenessStrategyUnique"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (IdUniquenessStrategyUnique), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) - TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h index 26450fc1f6f..37223597713 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h @@ -12,48 +12,37 @@ #define TAO_ID_UNIQUENESSSTRATEGYUNIQUE_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "tao/PortableServer/IdUniquenessStrategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/IdUniquenessStrategy.h" -#include "ace/Service_Config.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { namespace Portable_Server { - class TAO_PortableServer_Export IdUniquenessStrategyUnique - : public IdUniquenessStrategy + class IdUniquenessStrategyUnique : public IdUniquenessStrategy { public: - IdUniquenessStrategyUnique (); + IdUniquenessStrategyUnique () = default; - virtual void strategy_init (TAO_Root_POA *poa); + void strategy_init (TAO_Root_POA *poa) override; - virtual void strategy_cleanup (); + void strategy_cleanup () override; - virtual bool is_servant_activation_allowed ( - PortableServer::Servant servant, - bool &wait_occurred_restart_call); + bool is_servant_activation_allowed (PortableServer::Servant servant, bool &wait_occurred_restart_call) override; - virtual bool allow_multiple_activations () const; - - virtual ::PortableServer::IdUniquenessPolicyValue type() const; + bool allow_multiple_activations () const override; private: - TAO_Root_POA* poa_; + TAO_Root_POA* poa_ {}; }; } } -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdUniquenessStrategyUnique) -ACE_FACTORY_DECLARE (TAO_PortableServer, IdUniquenessStrategyUnique) - TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp deleted file mode 100644 index 71383493628..00000000000 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp +++ /dev/null @@ -1,59 +0,0 @@ -#include "tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h" -#include "tao/PortableServer/IdUniquenessStrategyUnique.h" -#include "ace/Dynamic_Service.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace Portable_Server - { - IdUniquenessStrategy* - IdUniquenessStrategyUniqueFactoryImpl::create ( - ::PortableServer::IdUniquenessPolicyValue value) - { - IdUniquenessStrategy* strategy = 0; - - switch (value) - { - case ::PortableServer::UNIQUE_ID : - { - ACE_NEW_RETURN (strategy, IdUniquenessStrategyUnique, 0); - break; - } - case ::PortableServer::MULTIPLE_ID : - { - TAOLIB_ERROR ((LM_ERROR, "Incorrect type in IdUniquenessStrategyUniqueFactoryImpl")); - break; - } - } - - return strategy; - } - - void - IdUniquenessStrategyUniqueFactoryImpl::destroy ( - IdUniquenessStrategy *strategy) - { - strategy->strategy_cleanup (); - - delete strategy; - } - - } -} - -ACE_STATIC_SVC_DEFINE ( - IdUniquenessStrategyUniqueFactoryImpl, - ACE_TEXT ("IdUniquenessStrategyUniqueFactory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (IdUniquenessStrategyUniqueFactoryImpl), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) - -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - IdUniquenessStrategyUniqueFactoryImpl, - TAO::Portable_Server::IdUniquenessStrategyUniqueFactoryImpl) - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h deleted file mode 100644 index f5dfc25b016..00000000000 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h +++ /dev/null @@ -1,48 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file IdUniquenessStrategyUniqueFactoryImpl.h - * - * @author Johnny Willemsen - */ -//============================================================================= - -#ifndef TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYUNIQUEFACTORYIMPL_H -#define TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYUNIQUEFACTORYIMPL_H -#include /**/ "ace/pre.h" - -#include "tao/PortableServer/portableserver_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Service_Config.h" -#include "tao/PortableServer/IdUniquenessStrategyFactory.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace Portable_Server - { - class TAO_PortableServer_Export IdUniquenessStrategyUniqueFactoryImpl - : public IdUniquenessStrategyFactory - { - public: - /// Create a new strategy - virtual IdUniquenessStrategy* create (::PortableServer::IdUniquenessPolicyValue value); - - virtual void destroy (IdUniquenessStrategy *strategy); - }; - } -} - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdUniquenessStrategyUniqueFactoryImpl) -ACE_FACTORY_DECLARE (TAO_PortableServer, IdUniquenessStrategyUniqueFactoryImpl) - -TAO_END_VERSIONED_NAMESPACE_DECL - -#include /**/ "ace/post.h" -#endif /* TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYUNIQUEFACTORYIMPL_H */ diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp deleted file mode 100644 index 3bc68da0d7e..00000000000 --- a/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp +++ /dev/null @@ -1,23 +0,0 @@ -// -*- C++ -*- -#include "tao/PortableServer/ImplicitActivationStrategy.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace Portable_Server - { - void - ImplicitActivationStrategy::strategy_init (TAO_Root_POA * /*poa*/) - { - // dependent on type create the correct strategy. - } - - void - ImplicitActivationStrategy::strategy_cleanup () - { - } - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategy.h b/TAO/tao/PortableServer/ImplicitActivationStrategy.h index 491df8cf702..f1491cf6664 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategy.h +++ b/TAO/tao/PortableServer/ImplicitActivationStrategy.h @@ -12,7 +12,7 @@ #define TAO_ACTIVATION_STRATEGY_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/Policy_Strategy.h" +#include "tao/orbconf.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,12 +25,10 @@ namespace TAO namespace Portable_Server { class ImplicitActivationStrategy - : public Policy_Strategy { public: - virtual void strategy_init(TAO_Root_POA *poa); - - virtual void strategy_cleanup(); + ImplicitActivationStrategy () = default; + virtual ~ImplicitActivationStrategy () = default; virtual bool allow_implicit_activation () const = 0; }; diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp index 98c308606d8..97762e51cb7 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp @@ -15,17 +15,4 @@ namespace TAO } } -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - ImplicitActivationStrategyExplicit, - TAO::Portable_Server::ImplicitActivationStrategyExplicit) - -ACE_STATIC_SVC_DEFINE ( - ImplicitActivationStrategyExplicit, - ACE_TEXT ("ImplicitActivationStrategyExplicit"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (ImplicitActivationStrategyExplicit), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) - TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h index 05846df574a..03a2663f6b3 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h @@ -12,35 +12,27 @@ #define TAO_IMPLICITACTIVATIONSTRATEGYEXPLICIT_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "tao/PortableServer/ImplicitActivationStrategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/ImplicitActivationStrategy.h" -#include "ace/Service_Config.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { namespace Portable_Server { - class ImplicitActivationStrategyExplicit : - public ImplicitActivationStrategy + class ImplicitActivationStrategyExplicit : public ImplicitActivationStrategy { public: - virtual bool allow_implicit_activation () const; + bool allow_implicit_activation () const override; }; } } -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ImplicitActivationStrategyExplicit) -ACE_FACTORY_DECLARE (TAO_PortableServer, ImplicitActivationStrategyExplicit) - TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_IMPLICITACTIVATIONSTRATEGYEXPLICIT_H */ diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h b/TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h deleted file mode 100644 index f2d8514ef57..00000000000 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h +++ /dev/null @@ -1,47 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file ImplicitActivationStrategyFactory.h - * - * @author Johnny Willemsen - */ -//============================================================================= - -#ifndef TAO_PORTABLESERVER_IMPLICITACTIVATIONSTRATEGYFACTORY_H -#define TAO_PORTABLESERVER_IMPLICITACTIVATIONSTRATEGYFACTORY_H -#include /**/ "ace/pre.h" - -#include "tao/PortableServer/portableserver_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/PortableServer/StrategyFactory.h" -#include "tao/PortableServer/ImplicitActivationPolicyC.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace Portable_Server - { - class ImplicitActivationStrategy; - - class TAO_PortableServer_Export ImplicitActivationStrategyFactory - : public StrategyFactory - { - public: - /// Create a new servant retention strategy - virtual ImplicitActivationStrategy* create (::PortableServer::ImplicitActivationPolicyValue value) = 0; - - virtual void destroy (ImplicitActivationStrategy *strategy) = 0; - }; - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#include /**/ "ace/post.h" -#endif /* TAO_PORTABLESERVER_IMPLICITACTIVATIONSTRATEGYFACTORY_H */ diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp deleted file mode 100644 index d9035f5bcae..00000000000 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp +++ /dev/null @@ -1,67 +0,0 @@ -// -*- C++ -*- -#include "tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h" -#include "ace/Dynamic_Service.h" -#include "tao/PortableServer/ImplicitActivationStrategyImplicit.h" -#include "tao/PortableServer/ImplicitActivationStrategyExplicit.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace Portable_Server - { - ImplicitActivationStrategy* - ImplicitActivationStrategyFactoryImpl::create ( - ::PortableServer::ImplicitActivationPolicyValue value) - { - ImplicitActivationStrategy* strategy = 0; - const char * strategy_name = 0; - - switch (value) - { - case ::PortableServer::IMPLICIT_ACTIVATION : - { - strategy_name = "ImplicitActivationStrategyImplicit"; - break; - } - case ::PortableServer::NO_IMPLICIT_ACTIVATION : - { - strategy_name = "ImplicitActivationStrategyExplicit"; - break; - } - } - - strategy = - ACE_Dynamic_Service::instance (strategy_name); - - if (strategy == 0) - TAOLIB_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) ERROR, Unable to get %C\n"), - strategy_name)); - - return strategy; - } - - void - ImplicitActivationStrategyFactoryImpl::destroy ( - ImplicitActivationStrategy * /*strategy*/) - { - // Noop because both types are singletons - } - } -} - -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - ImplicitActivationStrategyFactoryImpl, - TAO_VERSIONED_NAMESPACE_NAME::TAO::Portable_Server::ImplicitActivationStrategyFactoryImpl) - -ACE_STATIC_SVC_DEFINE ( - ImplicitActivationStrategyFactoryImpl, - ACE_TEXT ("ImplicitActivationStrategyFactory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (ImplicitActivationStrategyFactoryImpl), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h deleted file mode 100644 index 3ee40e3d8ba..00000000000 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h +++ /dev/null @@ -1,49 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file ImplicitActivationStrategyFactoryImpl.h - * - * @author Johnny Willemsen - */ -//============================================================================= - -#ifndef TAO_PORTABLESERVER_IMPLICITACTIVATIONSTRATEGYFACTORYIMPL_H -#define TAO_PORTABLESERVER_IMPLICITACTIVATIONSTRATEGYFACTORYIMPL_H -#include /**/ "ace/pre.h" - -#include "tao/PortableServer/portableserver_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Service_Config.h" -#include "tao/PortableServer/ImplicitActivationStrategyFactory.h" - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace Portable_Server - { - class ImplicitActivationStrategyFactoryImpl - : public ImplicitActivationStrategyFactory - { - public: - /// Create a new servant retention strategy - virtual ImplicitActivationStrategy* create (::PortableServer::ImplicitActivationPolicyValue value); - - virtual void destroy (ImplicitActivationStrategy *strategy); - }; - } -} - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ImplicitActivationStrategyFactoryImpl) -ACE_FACTORY_DECLARE (TAO_PortableServer, ImplicitActivationStrategyFactoryImpl) - -TAO_END_VERSIONED_NAMESPACE_DECL - -#include /**/ "ace/post.h" -#endif /* TAO_PORTABLESERVER_IMPLICITACTIVATIONSTRATEGYFACTORYIMPL_H */ diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp index 989dd133b88..5ff61d8362b 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp @@ -16,19 +16,6 @@ namespace TAO } } -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - ImplicitActivationStrategyImplicit, - TAO::Portable_Server::ImplicitActivationStrategyImplicit) - -ACE_STATIC_SVC_DEFINE ( - ImplicitActivationStrategyImplicit, - ACE_TEXT ("ImplicitActivationStrategyImplicit"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (ImplicitActivationStrategyImplicit), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) - TAO_END_VERSIONED_NAMESPACE_DECL #endif diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h index 68d0a997130..daa7ba096a9 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h @@ -12,15 +12,12 @@ #define TAO_IMPLICITACTIVATIONSTRATEGYIMPLICIT_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "tao/PortableServer/ImplicitActivationStrategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/ImplicitActivationStrategy.h" -#include "ace/Service_Config.h" - #if !defined (CORBA_E_MICRO) && !defined (CORBA_E_COMPACT) TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -29,18 +26,14 @@ namespace TAO { namespace Portable_Server { - class TAO_PortableServer_Export ImplicitActivationStrategyImplicit - : public ImplicitActivationStrategy + class ImplicitActivationStrategyImplicit : public ImplicitActivationStrategy { public: - virtual bool allow_implicit_activation () const; + bool allow_implicit_activation () const override; }; } } -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ImplicitActivationStrategyImplicit) -ACE_FACTORY_DECLARE (TAO_PortableServer, ImplicitActivationStrategyImplicit) - TAO_END_VERSIONED_NAMESPACE_DECL #endif diff --git a/TAO/tao/PortableServer/LifespanStrategy.cpp b/TAO/tao/PortableServer/LifespanStrategy.cpp index e331e653adb..6ea71982149 100644 --- a/TAO/tao/PortableServer/LifespanStrategy.cpp +++ b/TAO/tao/PortableServer/LifespanStrategy.cpp @@ -14,11 +14,6 @@ namespace TAO { namespace Portable_Server { - LifespanStrategy::LifespanStrategy () : - poa_ (0) - { - } - void LifespanStrategy::strategy_init (TAO_Root_POA *poa) { @@ -28,7 +23,7 @@ namespace TAO void LifespanStrategy::strategy_cleanup () { - poa_ = 0; + poa_ = nullptr; } CORBA::ULong diff --git a/TAO/tao/PortableServer/LifespanStrategy.h b/TAO/tao/PortableServer/LifespanStrategy.h index 01a9a150dbd..ac034037f9f 100644 --- a/TAO/tao/PortableServer/LifespanStrategy.h +++ b/TAO/tao/PortableServer/LifespanStrategy.h @@ -12,17 +12,18 @@ #define TAO_PORTABLESERVER_LIFESPANPOLICY_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/Policy_Strategy.h" +#include "tao/PortableServer/LifespanPolicyC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/LifespanPolicyC.h" #include "tao/Object_KeyC.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL +class TAO_Root_POA; + namespace TAO { namespace Portable_Server @@ -30,10 +31,10 @@ namespace TAO class Temporary_Creation_Time; class LifespanStrategy - : public Policy_Strategy { public: - LifespanStrategy (); + LifespanStrategy () = default; + virtual ~LifespanStrategy () = default; virtual void strategy_init (TAO_Root_POA *poa); @@ -70,8 +71,6 @@ namespace TAO /// Check the state of the POA. virtual void check_state () = 0; - virtual ::PortableServer::LifespanPolicyValue type () const = 0; - virtual bool use_imr () const = 0; virtual CORBA::Object_ptr imr_key_to_object ( @@ -79,7 +78,7 @@ namespace TAO const char *type_id) const = 0; protected: - TAO_Root_POA *poa_; + TAO_Root_POA *poa_ {}; }; } /* namespace Portable_Server */ } /* namespace TAO */ diff --git a/TAO/tao/PortableServer/LifespanStrategyFactory.h b/TAO/tao/PortableServer/LifespanStrategyFactory.h deleted file mode 100644 index e60df4872d1..00000000000 --- a/TAO/tao/PortableServer/LifespanStrategyFactory.h +++ /dev/null @@ -1,48 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file LifespanStrategyFactory.h - * - * @author Johnny Willemsen - */ -//============================================================================= - -#ifndef TAO_PORTABLESERVER_LIFEPSPANSTRATEGYFACTORY_H -#define TAO_PORTABLESERVER_LIFEPSPANSTRATEGYFACTORY_H -#include /**/ "ace/pre.h" - -#include "tao/PortableServer/portableserver_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/PortableServer/StrategyFactory.h" -#include "tao/PortableServer/LifespanPolicyC.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace Portable_Server - { - class LifespanStrategy; - - class TAO_PortableServer_Export LifespanStrategyFactory - : public StrategyFactory - { - public: - /// Create a new servant retention strategy - virtual LifespanStrategy* create (::PortableServer::LifespanPolicyValue value) = 0; - - /// Cleanup the given strategy instance - virtual void destroy (LifespanStrategy *strategy) = 0; - }; - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#include /**/ "ace/post.h" -#endif /* TAO_PORTABLESERVER_LIFEPSPANSTRATEGYFACTORY_H */ diff --git a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp deleted file mode 100644 index f66cdebd8b3..00000000000 --- a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp +++ /dev/null @@ -1,90 +0,0 @@ -#include "tao/PortableServer/LifespanStrategyFactoryImpl.h" -#include "tao/PortableServer/LifespanStrategy.h" -#include "ace/Dynamic_Service.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace Portable_Server - { - LifespanStrategy* - LifespanStrategyFactoryImpl::create ( - ::PortableServer::LifespanPolicyValue value) - { - LifespanStrategy *strategy = 0; - const char *strategy_name = 0; - - switch (value) - { - case ::PortableServer::PERSISTENT : - { - strategy_name = "LifespanStrategyPersistentFactory"; - break; - } - case ::PortableServer::TRANSIENT : - { - strategy_name = "LifespanStrategyTransientFactory"; - break; - } - } - - LifespanStrategyFactory *strategy_factory = - ACE_Dynamic_Service::instance (strategy_name); - - if (strategy_factory != 0) - strategy = strategy_factory->create (value); - else - TAOLIB_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) ERROR, Unable to get %C\n"), - strategy_name)); - - - return strategy; - } - - void - LifespanStrategyFactoryImpl::destroy (LifespanStrategy *strategy) - { - switch (strategy->type ()) - { - case ::PortableServer::PERSISTENT : - { - LifespanStrategyFactory *strategy_factory = - ACE_Dynamic_Service::instance ("LifespanStrategyPersistentFactory"); - - if (strategy_factory != 0) - { - strategy_factory->destroy (strategy); - } - break; - } - case ::PortableServer::TRANSIENT : - { - LifespanStrategyFactory *strategy_factory = - ACE_Dynamic_Service::instance ("LifespanStrategyTransientFactory"); - - if (strategy_factory != 0) - { - strategy_factory->destroy (strategy); - } - break; - } - } - } - } -} - -ACE_STATIC_SVC_DEFINE ( - LifespanStrategyFactoryImpl, - ACE_TEXT ("LifespanStrategyFactory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (LifespanStrategyFactoryImpl), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) - -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - LifespanStrategyFactoryImpl, - TAO::Portable_Server::LifespanStrategyFactoryImpl) -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h deleted file mode 100644 index b076007cd7a..00000000000 --- a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h +++ /dev/null @@ -1,50 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file LifespanStrategyFactoryImpl.h - * - * @author Johnny Willemsen - */ -//============================================================================= - -#ifndef TAO_PORTABLESERVER_LIFEPSPANSTRATEGYFACTORYIMPL_H -#define TAO_PORTABLESERVER_LIFEPSPANSTRATEGYFACTORYIMPL_H -#include /**/ "ace/pre.h" - -#include "tao/PortableServer/portableserver_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Service_Config.h" -#include "tao/PortableServer/LifespanStrategyFactory.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace Portable_Server - { - class TAO_PortableServer_Export LifespanStrategyFactoryImpl - : public LifespanStrategyFactory - { - public: - /// Create a new servant retention strategy - virtual LifespanStrategy* create (::PortableServer::LifespanPolicyValue value); - - /// Cleanup the given strategy instance - virtual void destroy (LifespanStrategy *strategy); - }; - } -} -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, LifespanStrategyFactoryImpl) -ACE_FACTORY_DECLARE (TAO_PortableServer, LifespanStrategyFactoryImpl) - - -TAO_END_VERSIONED_NAMESPACE_DECL - - -#include /**/ "ace/post.h" -#endif /* TAO_PORTABLESERVER_LIFEPSPANSTRATEGYFACTORYIMPL_H */ diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp index 62f681a6f18..32bb04a343c 100644 --- a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp @@ -127,12 +127,6 @@ namespace TAO this->poa_->tao_poa_manager().check_state (); } - ::PortableServer::LifespanPolicyValue - LifespanStrategyPersistent::type() const - { - return ::PortableServer::PERSISTENT; - } - bool LifespanStrategyPersistent::use_imr () const { diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistent.h b/TAO/tao/PortableServer/LifespanStrategyPersistent.h index 03d2075f81d..9b964c2b184 100644 --- a/TAO/tao/PortableServer/LifespanStrategyPersistent.h +++ b/TAO/tao/PortableServer/LifespanStrategyPersistent.h @@ -34,33 +34,30 @@ namespace TAO public: LifespanStrategyPersistent (); - virtual void strategy_init(TAO_Root_POA *poa); + void strategy_init(TAO_Root_POA *poa) override; - virtual void notify_startup (); + void notify_startup () override; - virtual void notify_shutdown (); + void notify_shutdown () override; char key_type () const; - virtual CORBA::Boolean is_persistent () const; + CORBA::Boolean is_persistent () const override; CORBA::ULong key_length () const; - virtual void create_key (CORBA::Octet *buffer, CORBA::ULong& starting_at); + void create_key (CORBA::Octet *buffer, CORBA::ULong& starting_at) override; - virtual bool + bool validate (CORBA::Boolean is_persistent, - const TAO::Portable_Server::Temporary_Creation_Time& creation_time) const; + const TAO::Portable_Server::Temporary_Creation_Time& creation_time) const override; /// Check the state of the POA. - virtual void check_state (); + void check_state () override; - virtual ::PortableServer::LifespanPolicyValue type() const; + bool use_imr () const override; - virtual bool use_imr () const; - - virtual CORBA::Object_ptr imr_key_to_object(const TAO::ObjectKey &key, - const char *type_id) const; + CORBA::Object_ptr imr_key_to_object(const TAO::ObjectKey &key, const char *type_id) const override; private: bool use_imr_; diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp deleted file mode 100644 index cd56cf99c58..00000000000 --- a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp +++ /dev/null @@ -1,58 +0,0 @@ -// -*- C++ -*- -#include "tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h" -#include "ace/Dynamic_Service.h" -#include "tao/PortableServer/LifespanStrategyPersistent.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace Portable_Server - { - LifespanStrategy* - LifespanStrategyPersistentFactoryImpl::create ( - ::PortableServer::LifespanPolicyValue value) - { - LifespanStrategy* strategy = 0; - - switch (value) - { - case ::PortableServer::PERSISTENT : - { - ACE_NEW_RETURN (strategy, LifespanStrategyPersistent, 0); - break; - } - case ::PortableServer::TRANSIENT : - { - TAOLIB_ERROR ((LM_ERROR, "Incorrect type in LifespanStrategyPersistentFactoryImpl")); - break; - } - } - - return strategy; - } - - void - LifespanStrategyPersistentFactoryImpl::destroy (LifespanStrategy *strategy) - { - strategy->strategy_cleanup (); - - delete strategy; - } - } -} - -ACE_STATIC_SVC_DEFINE ( - LifespanStrategyPersistentFactoryImpl, - ACE_TEXT ("LifespanStrategyPersistentFactory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (LifespanStrategyPersistentFactoryImpl), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) - -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - LifespanStrategyPersistentFactoryImpl, - TAO::Portable_Server::LifespanStrategyPersistentFactoryImpl) - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h deleted file mode 100644 index 77fbcaa3466..00000000000 --- a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h +++ /dev/null @@ -1,50 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file LifespanStrategyPersistentFactoryImpl.h - * - * @author Johnny Willemsen - */ -//============================================================================= - -#ifndef TAO_PORTABLESERVER_LIFEPSPANSTRATEGYPERSISTENTFACTORYIMPL_H -#define TAO_PORTABLESERVER_LIFEPSPANSTRATEGYPERSISTENTFACTORYIMPL_H -#include /**/ "ace/pre.h" - -#include "tao/PortableServer/portableserver_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Service_Config.h" -#include "tao/PortableServer/LifespanStrategyFactory.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace Portable_Server - { - class TAO_PortableServer_Export LifespanStrategyPersistentFactoryImpl - : public LifespanStrategyFactory - { - public: - /// Create a new strategy - virtual LifespanStrategy* create (::PortableServer::LifespanPolicyValue value); - - /// Cleanup the given strategy instance - virtual void destroy (LifespanStrategy *strategy); - }; - } -} - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, LifespanStrategyPersistentFactoryImpl) -ACE_FACTORY_DECLARE (TAO_PortableServer, LifespanStrategyPersistentFactoryImpl) - -TAO_END_VERSIONED_NAMESPACE_DECL - - -#include /**/ "ace/post.h" -#endif /* TAO_PORTABLESERVER_LIFEPSPANSTRATEGYPERSISTENTFACTORYIMPL_H */ diff --git a/TAO/tao/PortableServer/LifespanStrategyTransient.cpp b/TAO/tao/PortableServer/LifespanStrategyTransient.cpp index 268ea7b3546..eb6ed65faeb 100644 --- a/TAO/tao/PortableServer/LifespanStrategyTransient.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyTransient.cpp @@ -108,12 +108,6 @@ namespace TAO { return CORBA::Object::_nil(); } - - ::PortableServer::LifespanPolicyValue - LifespanStrategyTransient::type () const - { - return ::PortableServer::TRANSIENT; - } } /* namespace Portable_Server */ } /* namespace TAO */ diff --git a/TAO/tao/PortableServer/LifespanStrategyTransient.h b/TAO/tao/PortableServer/LifespanStrategyTransient.h index 161994e964a..5a3c7d988d5 100644 --- a/TAO/tao/PortableServer/LifespanStrategyTransient.h +++ b/TAO/tao/PortableServer/LifespanStrategyTransient.h @@ -27,40 +27,35 @@ namespace TAO { namespace Portable_Server { - class LifespanStrategyTransient - : public LifespanStrategy + class LifespanStrategyTransient : public LifespanStrategy { public: LifespanStrategyTransient (); - virtual void notify_startup (); + void notify_startup () override; - virtual void notify_shutdown (); + void notify_shutdown () override; char key_type () const; - virtual CORBA::Boolean is_persistent () const; + CORBA::Boolean is_persistent () const override; CORBA::ULong key_length () const; - virtual void create_key (CORBA::Octet *buffer, CORBA::ULong& starting_at); + void create_key (CORBA::Octet *buffer, CORBA::ULong& starting_at) override; - virtual bool validate (CORBA::Boolean is_persistent, - const TAO::Portable_Server::Temporary_Creation_Time& creation_time) const; + const TAO::Portable_Server::Temporary_Creation_Time& creation_time) const override; /// Check the state of the POA. - virtual void check_state (); + void check_state () override; - virtual ::PortableServer::LifespanPolicyValue type() const; + bool use_imr () const override; - virtual bool use_imr () const; - - virtual CORBA::Object_ptr imr_key_to_object (const TAO::ObjectKey &key, - const char *type_id) const; + CORBA::Object_ptr imr_key_to_object (const TAO::ObjectKey &key, const char *type_id) const override; private: - TAO::Portable_Server::Creation_Time creation_time_; + TAO::Portable_Server::Creation_Time const creation_time_; }; } /* namespace Portable_Server */ } /* namespace TAO */ diff --git a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp deleted file mode 100644 index 05b6c6b1e17..00000000000 --- a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp +++ /dev/null @@ -1,59 +0,0 @@ -// -*- C++ -*- -#include "tao/PortableServer/LifespanStrategyTransientFactoryImpl.h" -#include "ace/Dynamic_Service.h" -#include "tao/PortableServer/LifespanStrategyTransient.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace Portable_Server - { - LifespanStrategy* - LifespanStrategyTransientFactoryImpl::create ( - ::PortableServer::LifespanPolicyValue value) - { - LifespanStrategy* strategy = 0; - - switch (value) - { - case ::PortableServer::PERSISTENT : - { - TAOLIB_ERROR ((LM_ERROR, "Incorrect type in LifespanStrategyTransientFactoryImpl")); - break; - } - case ::PortableServer::TRANSIENT : - { - ACE_NEW_RETURN (strategy, LifespanStrategyTransient, 0); - break; - } - } - - return strategy; - } - - void - LifespanStrategyTransientFactoryImpl::destroy (LifespanStrategy *strategy) - { - strategy->strategy_cleanup (); - - delete strategy; - } - } -} - -ACE_STATIC_SVC_DEFINE ( - LifespanStrategyTransientFactoryImpl, - ACE_TEXT ("LifespanStrategyTransientFactory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (LifespanStrategyTransientFactoryImpl), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) - -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - LifespanStrategyTransientFactoryImpl, - TAO::Portable_Server::LifespanStrategyTransientFactoryImpl) - -TAO_END_VERSIONED_NAMESPACE_DECL - diff --git a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h deleted file mode 100644 index 1d90c3f23f5..00000000000 --- a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h +++ /dev/null @@ -1,51 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file LifespanStrategyTransientFactoryImpl.h - * - * @author Johnny Willemsen - */ -//============================================================================= - -#ifndef TAO_PORTABLESERVER_LIFEPSPANSTRATEGYTRANSIENTFACTORYIMPL_H -#define TAO_PORTABLESERVER_LIFEPSPANSTRATEGYTRANSIENTFACTORYIMPL_H - -#include /**/ "ace/pre.h" - -#include "tao/PortableServer/portableserver_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Service_Config.h" -#include "tao/PortableServer/LifespanStrategyFactory.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace Portable_Server - { - class TAO_PortableServer_Export LifespanStrategyTransientFactoryImpl - : public LifespanStrategyFactory - { - public: - /// Create a new strategy - virtual LifespanStrategy* create (::PortableServer::LifespanPolicyValue value); - - /// Cleanup the given strategy instance - virtual void destroy (LifespanStrategy *strategy); - }; - } -} - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, LifespanStrategyTransientFactoryImpl) -ACE_FACTORY_DECLARE (TAO_PortableServer, LifespanStrategyTransientFactoryImpl) - -TAO_END_VERSIONED_NAMESPACE_DECL - -#include /**/ "ace/post.h" - -#endif /* TAO_PORTABLESERVER_LIFEPSPANSTRATEGYTRANSIENTFACTORYIMPL_H */ diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp index bc65cf1fbc3..77a78f08282 100644 --- a/TAO/tao/PortableServer/Object_Adapter.cpp +++ b/TAO/tao/PortableServer/Object_Adapter.cpp @@ -509,30 +509,30 @@ TAO_Object_Adapter::locate_servant_i (const TAO::ObjectKey &key) this->locate_poa (key, id, poa); PortableServer::Servant servant = 0; - TAO_SERVANT_LOCATION const servant_location = + TAO_Servant_Location const servant_location = poa->locate_servant_i (id, servant); switch (servant_location) { - case TAO_SERVANT_FOUND: + case TAO_Servant_Location::Found: // Optimistic attitude - case TAO_DEFAULT_SERVANT: - case TAO_SERVANT_MANAGER: + case TAO_Servant_Location::Default_Servant: + case TAO_Servant_Location::Servant_Manager: return 0; - case TAO_SERVANT_NOT_FOUND: + case TAO_Servant_Location::Not_Found: return -1; } return -1; } -TAO_SERVANT_LOCATION +TAO_Servant_Location TAO_Object_Adapter::find_servant_i (const TAO::ObjectKey &key, PortableServer::Servant &servant) { PortableServer::ObjectId id; - TAO_Root_POA *poa = 0; + TAO_Root_POA *poa = nullptr; this->locate_poa (key, id, poa); @@ -547,7 +547,7 @@ TAO_Object_Adapter::open () // If a POA extension hasn't changed the servant dispatcher, initialize the // default one. - if (this->servant_dispatcher_ == 0) + if (!this->servant_dispatcher_) { ACE_NEW (this->servant_dispatcher_, TAO_Default_Servant_Dispatcher); @@ -560,8 +560,7 @@ TAO_Object_Adapter::open () ::CORBA::PolicyList policy; PortableServer::POAManager_var poa_manager - = poa_manager_factory_->create_POAManager (TAO_DEFAULT_ROOTPOAMANAGER_NAME, - policy); + = poa_manager_factory_->create_POAManager (TAO_DEFAULT_ROOTPOAMANAGER_NAME, policy); #else PortableServer::POAManager_ptr poa_manager_ptr; ::CORBA::PolicyList policy_list; diff --git a/TAO/tao/PortableServer/Object_Adapter.h b/TAO/tao/PortableServer/Object_Adapter.h index c041333d425..4f534d8471b 100644 --- a/TAO/tao/PortableServer/Object_Adapter.h +++ b/TAO/tao/PortableServer/Object_Adapter.h @@ -92,7 +92,7 @@ public: int locate_servant (const TAO::ObjectKey &key); - TAO_SERVANT_LOCATION find_servant (const TAO::ObjectKey &key, + TAO_Servant_Location find_servant (const TAO::ObjectKey &key, PortableServer::Servant &servant); int find_poa (const poa_name &system_name, @@ -165,7 +165,7 @@ public: protected: int locate_servant_i (const TAO::ObjectKey &key); - TAO_SERVANT_LOCATION find_servant_i (const TAO::ObjectKey &key, + TAO_Servant_Location find_servant_i (const TAO::ObjectKey &key, PortableServer::Servant &servant); void dispatch_servant_i (const TAO::ObjectKey &key, diff --git a/TAO/tao/PortableServer/Object_Adapter.inl b/TAO/tao/PortableServer/Object_Adapter.inl index 7acba182498..7092ede9222 100644 --- a/TAO/tao/PortableServer/Object_Adapter.inl +++ b/TAO/tao/PortableServer/Object_Adapter.inl @@ -50,12 +50,12 @@ TAO_Object_Adapter::locate_servant (const TAO::ObjectKey &key) return this->locate_servant_i (key); } -ACE_INLINE TAO_SERVANT_LOCATION +ACE_INLINE TAO_Servant_Location TAO_Object_Adapter::find_servant (const TAO::ObjectKey &key, PortableServer::Servant &servant) { // Lock access for the duration of this transaction. - TAO_OBJECT_ADAPTER_GUARD_RETURN (TAO_SERVANT_NOT_FOUND); + TAO_OBJECT_ADAPTER_GUARD_RETURN (Not_Found); return this->find_servant_i (key, servant); } diff --git a/TAO/tao/PortableServer/Policy_Strategy.h b/TAO/tao/PortableServer/Policy_Strategy.h deleted file mode 100644 index 1acd9e71912..00000000000 --- a/TAO/tao/PortableServer/Policy_Strategy.h +++ /dev/null @@ -1,47 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Policy_Strategy.h - * - * @author Johnny Willemsen - */ -//============================================================================= - -#ifndef TAO_POLICY_STRATEGY_H -#define TAO_POLICY_STRATEGY_H -#include /**/ "ace/pre.h" - -#include "tao/orbconf.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Service_Object.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -class TAO_Root_POA; - -namespace TAO -{ - namespace Portable_Server - { - class Policy_Strategy - : public ACE_Service_Object - { - public: - virtual void strategy_init(TAO_Root_POA *poa) = 0; - - virtual void strategy_cleanup() = 0; - - virtual ~Policy_Strategy () {}; - }; - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#include /**/ "ace/post.h" -#endif /* TAO_POLICY_STRATEGY_H */ diff --git a/TAO/tao/PortableServer/PortableServer.cpp b/TAO/tao/PortableServer/PortableServer.cpp index 42268bcdfec..8d2cd3f885c 100644 --- a/TAO/tao/PortableServer/PortableServer.cpp +++ b/TAO/tao/PortableServer/PortableServer.cpp @@ -1,152 +1,15 @@ #include "tao/PortableServer/PortableServer.h" -#include "tao/PortableServer/Object_Adapter.h" #include "tao/PortableServer/Object_Adapter_Factory.h" #include "tao/PortableServer/POA_Current_Factory.h" -#include "tao/PortableServer/ThreadStrategyFactoryImpl.h" -#include "tao/PortableServer/LifespanStrategyFactoryImpl.h" -#include "tao/PortableServer/IdAssignmentStrategyFactoryImpl.h" -#include "tao/PortableServer/IdUniquenessStrategyFactoryImpl.h" -#include "tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h" -#include "tao/PortableServer/RequestProcessingStrategyFactoryImpl.h" -#include "tao/PortableServer/ServantRetentionStrategyFactoryImpl.h" - -#include "tao/PortableServer/ThreadStrategyORBControl.h" -#include "tao/PortableServer/ThreadStrategySingle.h" -#include "tao/PortableServer/ThreadStrategySingleFactoryImpl.h" - -#include "tao/PortableServer/IdAssignmentStrategySystem.h" -#include "tao/PortableServer/IdAssignmentStrategyUser.h" - -#include "tao/PortableServer/IdUniquenessStrategyMultiple.h" -#include "tao/PortableServer/IdUniquenessStrategyUnique.h" - -#include "tao/PortableServer/ImplicitActivationStrategyExplicit.h" -#include "tao/PortableServer/ImplicitActivationStrategyImplicit.h" - -#include "tao/PortableServer/RequestProcessingStrategyAOMOnly.h" -#include "tao/PortableServer/RequestProcessingStrategyDefaultServant.h" -#include "tao/PortableServer/RequestProcessingStrategyServantManager.h" - -#include "tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h" -#include "tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h" - -#include "tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h" -#include "tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h" -#include "tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h" -#include "tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h" - -#include "tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h" - -#include "tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h" -#include "tao/PortableServer/LifespanStrategyTransientFactoryImpl.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL int TAO_POA_Initializer::init () { - ACE_Service_Config::process_directive ( - ace_svc_desc_IdAssignmentStrategySystem); - -#if !defined (CORBA_E_MICRO) - ACE_Service_Config::process_directive ( - ace_svc_desc_IdAssignmentStrategyUser); -#endif /* CORBA_E_MICRO */ - -#if !defined (CORBA_E_MICRO) - ACE_Service_Config::process_directive ( - ace_svc_desc_IdUniquenessStrategyMultiple); -#endif /* CORBA_E_MICRO */ - - ACE_Service_Config::process_directive ( - ace_svc_desc_IdUniquenessStrategyUnique); - - ACE_Service_Config::process_directive ( - ace_svc_desc_IdUniquenessStrategyUniqueFactoryImpl); - - ACE_Service_Config::process_directive ( - ace_svc_desc_ImplicitActivationStrategyExplicit); - -#if !defined (CORBA_E_MICRO) && !defined (CORBA_E_COMPACT) - ACE_Service_Config::process_directive ( - ace_svc_desc_ImplicitActivationStrategyImplicit); -#endif /* CORBA_E_MICRO */ - - // Strategy factories - - ACE_Service_Config::process_directive ( - ace_svc_desc_ThreadStrategyFactoryImpl); - -#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_MICRO) && !defined (CORBA_E_COMPACT) - ACE_Service_Config::process_directive ( - ace_svc_desc_ThreadStrategySingleFactoryImpl); -#endif /* TAO_HAS_MINIMUM_POA == 0 */ - - ACE_Service_Config::process_directive ( - ace_svc_desc_LifespanStrategyFactoryImpl); - -#if !defined (CORBA_E_MICRO) - ACE_Service_Config::process_directive ( - ace_svc_desc_LifespanStrategyPersistentFactoryImpl); -#endif /* CORBA_E_MICRO */ - - ACE_Service_Config::process_directive ( - ace_svc_desc_LifespanStrategyTransientFactoryImpl); - - ACE_Service_Config::process_directive ( - ace_svc_desc_IdAssignmentStrategyFactoryImpl); - - ACE_Service_Config::process_directive ( - ace_svc_desc_IdUniquenessStrategyFactoryImpl); - - ACE_Service_Config::process_directive ( - ace_svc_desc_ImplicitActivationStrategyFactoryImpl); - - ACE_Service_Config::process_directive ( - ace_svc_desc_RequestProcessingStrategyFactoryImpl); - - ACE_Service_Config::process_directive ( - ace_svc_desc_RequestProcessingStrategyAOMOnlyFactoryImpl); - -#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - ACE_Service_Config::process_directive ( - ace_svc_desc_RequestProcessingStrategyDefaultServantFactoryImpl); - - ACE_Service_Config::process_directive ( - ace_svc_desc_RequestProcessingStrategyServantActivatorFactoryImpl); - - ACE_Service_Config::process_directive ( - ace_svc_desc_RequestProcessingStrategyServantLocatorFactoryImpl); -#endif /* TAO_HAS_MINIMUM_POA == 0 */ - - ACE_Service_Config::process_directive ( - ace_svc_desc_ServantRetentionStrategyFactoryImpl); - - ACE_Service_Config::process_directive ( - ace_svc_desc_ServantRetentionStrategyRetainFactoryImpl); - -#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_MICRO) && !defined (CORBA_E_COMPACT) - ACE_Service_Config::process_directive ( - ace_svc_desc_ServantRetentionStrategyNonRetainFactoryImpl); -#endif /* TAO_HAS_MINIMUM_POA == 0 */ - - // Strategy implementations - - ACE_Service_Config::process_directive ( - ace_svc_desc_ThreadStrategyORBControl); - -#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_MICRO) && !defined (CORBA_E_COMPACT) - ACE_Service_Config::process_directive ( - ace_svc_desc_ThreadStrategySingle); -#endif /* TAO_HAS_MINIMUM_POA == 0 */ - - ACE_Service_Config::process_directive ( - ace_svc_desc_TAO_POA_Current_Factory); + ACE_Service_Config::process_directive (ace_svc_desc_TAO_POA_Current_Factory); - return - ACE_Service_Config::process_directive ( - ace_svc_desc_TAO_Object_Adapter_Factory); + return ACE_Service_Config::process_directive (ace_svc_desc_TAO_Object_Adapter_Factory); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Regular_POA.cpp b/TAO/tao/PortableServer/Regular_POA.cpp index e47ea8010a6..867e819de30 100644 --- a/TAO/tao/PortableServer/Regular_POA.cpp +++ b/TAO/tao/PortableServer/Regular_POA.cpp @@ -28,10 +28,6 @@ TAO_Regular_POA::TAO_Regular_POA (const TAO_Root_POA::String &name, { } -TAO_Regular_POA::~TAO_Regular_POA () -{ -} - void TAO_Regular_POA::remove_from_parent_i () { diff --git a/TAO/tao/PortableServer/Regular_POA.h b/TAO/tao/PortableServer/Regular_POA.h index 9da69970431..e11f4a1d4fe 100644 --- a/TAO/tao/PortableServer/Regular_POA.h +++ b/TAO/tao/PortableServer/Regular_POA.h @@ -47,16 +47,16 @@ public: TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter); - virtual ~TAO_Regular_POA (); + ~TAO_Regular_POA () override = default; - PortableServer::POA_ptr the_parent (); + PortableServer::POA_ptr the_parent () override; protected: - virtual void remove_from_parent_i (); + void remove_from_parent_i () override; - virtual CORBA::Boolean root () const; + CORBA::Boolean root () const override; - virtual char root_key_type (); + char root_key_type () override; /// The parent of this POA, be aware that in case this pointer is nill, /// we are a parent. This can be achieved by deriving from this Regular_POA diff --git a/TAO/tao/PortableServer/RequestProcessingStrategy.cpp b/TAO/tao/PortableServer/RequestProcessingStrategy.cpp index f564757c699..713b6a92e04 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategy.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategy.cpp @@ -14,20 +14,6 @@ namespace TAO { namespace Portable_Server { - RequestProcessingStrategy::RequestProcessingStrategy () - : poa_ (0) - { - } - - void - RequestProcessingStrategy::strategy_init( - TAO_Root_POA *poa, - ::PortableServer::ServantRetentionPolicyValue sr_value) - { - poa_ = poa; - sr_value_ = sr_value; - } - void RequestProcessingStrategy::strategy_init(TAO_Root_POA *poa) { @@ -37,13 +23,7 @@ namespace TAO void RequestProcessingStrategy::strategy_cleanup() { - poa_ = 0; - } - - ::PortableServer::ServantRetentionPolicyValue - RequestProcessingStrategy::sr_type() const - { - return sr_value_; + poa_ = nullptr; } } } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategy.h b/TAO/tao/PortableServer/RequestProcessingStrategy.h index 5378d1739a4..3a25f9182be 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategy.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategy.h @@ -12,13 +12,12 @@ #define TAO_REQUEST_PROCESSING_STRATEGY_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/Policy_Strategy.h" +#include "tao/PortableServer/PortableServer.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/PortableServer.h" #include "tao/PortableServer/Servant_Location.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -45,21 +44,16 @@ namespace TAO namespace Portable_Server { class RequestProcessingStrategy - : public Policy_Strategy { public: - RequestProcessingStrategy (); + RequestProcessingStrategy () = default; + virtual ~RequestProcessingStrategy () = default; virtual void strategy_init(TAO_Root_POA *poa); - virtual void strategy_init( - TAO_Root_POA *poa, - ::PortableServer::ServantRetentionPolicyValue); - virtual void strategy_cleanup(); #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - virtual PortableServer::ServantManager_ptr get_servant_manager () = 0; virtual void set_servant_manager ( @@ -68,10 +62,9 @@ namespace TAO virtual void set_servant (PortableServer::Servant servant) = 0; virtual PortableServer::Servant get_servant () = 0; - #endif /* TAO_HAS_MINIMUM_POA == 0 !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */ - virtual TAO_SERVANT_LOCATION locate_servant ( + virtual TAO_Servant_Location locate_servant ( const PortableServer::ObjectId &system_id, PortableServer::Servant &servant) = 0; @@ -101,13 +94,8 @@ namespace TAO const PortableServer::ObjectId &system_id, const TAO::Portable_Server::Servant_Upcall &servant_upcall) = 0; - virtual ::PortableServer::RequestProcessingPolicyValue type() const = 0; - - virtual ::PortableServer::ServantRetentionPolicyValue sr_type() const; - protected: - TAO_Root_POA* poa_; - ::PortableServer::ServantRetentionPolicyValue sr_value_; + TAO_Root_POA* poa_ {}; }; } } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp index 9a77833ffe3..6d90a05f023 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp @@ -12,12 +12,7 @@ namespace TAO { namespace Portable_Server { - RequestProcessingStrategyAOMOnly::RequestProcessingStrategyAOMOnly() - { - } - #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - PortableServer::ServantManager_ptr RequestProcessingStrategyAOMOnly::get_servant_manager () { @@ -43,10 +38,9 @@ namespace TAO { throw PortableServer::POA::WrongPolicy (); } - #endif /* TAO_HAS_MINIMUM_POA == 0 !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */ - TAO_SERVANT_LOCATION + TAO_Servant_Location RequestProcessingStrategyAOMOnly::locate_servant ( const PortableServer::ObjectId & system_id, PortableServer::Servant & servant) @@ -141,13 +135,6 @@ namespace TAO const TAO::Portable_Server::Servant_Upcall &/*servant_upcall*/) { } - - ::PortableServer::RequestProcessingPolicyValue - RequestProcessingStrategyAOMOnly::type() const - { - return ::PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY; - } - } } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h index 28718985f5f..011f360b876 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h @@ -32,58 +32,49 @@ namespace TAO * * Request Processing Strategy which only uses the Active Object Map (AOM) */ - class RequestProcessingStrategyAOMOnly - : public RequestProcessingStrategy + class RequestProcessingStrategyAOMOnly : public RequestProcessingStrategy { public: - RequestProcessingStrategyAOMOnly (); + RequestProcessingStrategyAOMOnly () = default; #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) + PortableServer::ServantManager_ptr get_servant_manager () override; - PortableServer::ServantManager_ptr - get_servant_manager (); + void set_servant_manager (PortableServer::ServantManager_ptr imgr) override; - void set_servant_manager (PortableServer::ServantManager_ptr imgr); - - void set_servant (PortableServer::Servant servant); - - PortableServer::Servant get_servant (); + void set_servant (PortableServer::Servant servant) override; + PortableServer::Servant get_servant () override; #endif /* TAO_HAS_MINIMUM_POA == 0 !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */ - virtual - TAO_SERVANT_LOCATION + TAO_Servant_Location locate_servant (const PortableServer::ObjectId &system_id, - PortableServer::Servant &servant); + PortableServer::Servant &servant) override; - virtual PortableServer::Servant locate_servant (const char *operation, const PortableServer::ObjectId &system_id, TAO::Portable_Server::Servant_Upcall &servant_upcall, TAO::Portable_Server::POA_Current_Impl &poa_current_impl, - bool &wait_occurred_restart_call); + bool &wait_occurred_restart_call) override; - virtual PortableServer::Servant system_id_to_servant ( - const PortableServer::ObjectId &system_id); + PortableServer::Servant system_id_to_servant ( + const PortableServer::ObjectId &system_id) override; - virtual PortableServer::Servant id_to_servant ( - const PortableServer::ObjectId &id); + PortableServer::Servant id_to_servant ( + const PortableServer::ObjectId &id) override; - virtual void cleanup_servant ( + void cleanup_servant ( PortableServer::Servant servant, - const PortableServer::ObjectId &user_id); + const PortableServer::ObjectId &user_id) override; - virtual void etherealize_objects (CORBA::Boolean etherealize_objects); + void etherealize_objects (CORBA::Boolean etherealize_objects) override; - virtual PortableServer::ObjectId *servant_to_id ( - PortableServer::Servant servant); + PortableServer::ObjectId *servant_to_id (PortableServer::Servant servant) override; - virtual void post_invoke_servant_cleanup( + void post_invoke_servant_cleanup( const PortableServer::ObjectId &system_id, - const TAO::Portable_Server::Servant_Upcall &servant_upcall); - - virtual ::PortableServer::RequestProcessingPolicyValue type() const; + const TAO::Portable_Server::Servant_Upcall &servant_upcall) override; }; } } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp deleted file mode 100644 index 2bdb5d8ce17..00000000000 --- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp +++ /dev/null @@ -1,61 +0,0 @@ -// -*- C++ -*- -#include "tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h" -#include "tao/PortableServer/RequestProcessingStrategy.h" -#include "tao/PortableServer/RequestProcessingStrategyAOMOnly.h" -#include "ace/Dynamic_Service.h" -#include "ace/Log_Msg.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace Portable_Server - { - RequestProcessingStrategy* - RequestProcessingStrategyAOMOnlyFactoryImpl::create ( - ::PortableServer::RequestProcessingPolicyValue value, - ::PortableServer::ServantRetentionPolicyValue /*srvalue*/) - { - RequestProcessingStrategy* strategy = 0; - - switch (value) - { - case ::PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY : - { - ACE_NEW_RETURN (strategy, RequestProcessingStrategyAOMOnly, 0); - break; - } - default : - { - TAOLIB_ERROR ((LM_ERROR, "Incorrect type in RequestProcessingStrategyAOMOnlyFactoryImpl")); - break; - } - } - - return strategy; - } - - void - RequestProcessingStrategyAOMOnlyFactoryImpl::destroy ( - RequestProcessingStrategy *strategy) - { - strategy->strategy_cleanup (); - - delete strategy; - } - } -} - -ACE_STATIC_SVC_DEFINE ( - RequestProcessingStrategyAOMOnlyFactoryImpl, - ACE_TEXT ("RequestProcessingStrategyAOMOnlyFactory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (RequestProcessingStrategyAOMOnlyFactoryImpl), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) - -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - RequestProcessingStrategyAOMOnlyFactoryImpl, - TAO::Portable_Server::RequestProcessingStrategyAOMOnlyFactoryImpl) -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h deleted file mode 100644 index c3bbc2407fb..00000000000 --- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h +++ /dev/null @@ -1,51 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file RequestProcessingStrategyAOMOnlyFactoryImpl.h - * - * @author Johnny Willemsen - */ -//============================================================================= - -#ifndef TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYAOMONLYFACTORYIMPL_H -#define TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYAOMONLYFACTORYIMPL_H -#include /**/ "ace/pre.h" - -#include "tao/PortableServer/portableserver_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Service_Config.h" -#include "tao/PortableServer/RequestProcessingStrategyFactory.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace Portable_Server - { - class TAO_PortableServer_Export RequestProcessingStrategyAOMOnlyFactoryImpl - : public RequestProcessingStrategyFactory - { - public: - /// Create a new servant retention strategy - virtual RequestProcessingStrategy* create ( - ::PortableServer::RequestProcessingPolicyValue value, - ::PortableServer::ServantRetentionPolicyValue srvalue); - - virtual void destroy (RequestProcessingStrategy *strategy); - }; - } -} - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyAOMOnlyFactoryImpl) -ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyAOMOnlyFactoryImpl) - -TAO_END_VERSIONED_NAMESPACE_DECL - - -#include /**/ "ace/post.h" -#endif /* TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYAOMONLYFACTORYIMPL_H*/ diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp index cd58b8697d9..97997f1baf6 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp @@ -18,15 +18,10 @@ namespace TAO { namespace Portable_Server { - RequestProcessingStrategyDefaultServant::RequestProcessingStrategyDefaultServant () - : default_servant_ (0) - { - } - void RequestProcessingStrategyDefaultServant::strategy_cleanup() { - this->default_servant_ = 0; + this->default_servant_ = nullptr; } PortableServer::ServantManager_ptr @@ -63,7 +58,7 @@ namespace TAO // once on the Servant argument before returning. When the POA no // longer needs the Servant, it will invoke _remove_ref on it the // same number of times. - if (servant != 0) + if (servant) { // A recursive thread lock without using a recursive thread // lock. Non_Servant_Upcall has a magic constructor and @@ -80,20 +75,20 @@ namespace TAO } } - TAO_SERVANT_LOCATION + TAO_Servant_Location RequestProcessingStrategyDefaultServant::locate_servant ( const PortableServer::ObjectId & system_id, PortableServer::Servant & servant) { - TAO_SERVANT_LOCATION location = TAO_SERVANT_NOT_FOUND; + TAO_Servant_Location location = TAO_Servant_Location::Not_Found; location = this->poa_->servant_present (system_id, servant); - if (location == TAO_SERVANT_NOT_FOUND) + if (location == TAO_Servant_Location::Not_Found) { - if (this->default_servant_.in () != 0) + if (this->default_servant_.in ()) { - location = TAO_DEFAULT_SERVANT; + location = TAO_Servant_Location::Default_Servant; } } @@ -108,13 +103,13 @@ namespace TAO TAO::Portable_Server::POA_Current_Impl &poa_current_impl, bool & /*wait_occurred_restart_call*/) { - PortableServer::Servant servant = 0; + PortableServer::Servant servant = nullptr; servant = this->poa_->find_servant (system_id, servant_upcall, poa_current_impl); - if (servant == 0) + if (!servant) { // If the POA has the USE_DEFAULT_SERVANT policy, a default servant // has been associated with the POA so the POA will invoke the @@ -122,7 +117,7 @@ namespace TAO // associated with the POA, the POA raises the OBJ_ADAPTER system // exception. PortableServer::Servant default_servant = this->default_servant_.in (); - if (default_servant == 0) + if (!default_servant) { throw ::CORBA::OBJ_ADAPTER ( CORBA::OMGVMCID | 3, @@ -144,7 +139,7 @@ namespace TAO { PortableServer::Servant servant = this->default_servant_.in (); - if (servant == 0) + if (!servant) { servant = this->poa_->find_servant (system_id); } @@ -158,7 +153,7 @@ namespace TAO { PortableServer::Servant servant = this->default_servant_.in (); - if (servant == 0) + if (!servant) { /* * If using default servant request processing strategy but @@ -239,12 +234,6 @@ namespace TAO const TAO::Portable_Server::Servant_Upcall &/*servant_upcall*/) { } - - ::PortableServer::RequestProcessingPolicyValue - RequestProcessingStrategyDefaultServant::type() const - { - return ::PortableServer::USE_DEFAULT_SERVANT; - } } } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h index e0c9f62f970..5318c0482a7 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h @@ -37,52 +37,50 @@ namespace TAO : public RequestProcessingStrategy { public: - RequestProcessingStrategyDefaultServant (); + RequestProcessingStrategyDefaultServant () = default; - virtual void strategy_cleanup(); + void strategy_cleanup() override; - PortableServer::ServantManager_ptr get_servant_manager (); + PortableServer::ServantManager_ptr get_servant_manager () override; - void set_servant_manager (PortableServer::ServantManager_ptr imgr); + void set_servant_manager (PortableServer::ServantManager_ptr imgr) override; - PortableServer::Servant get_servant (); + PortableServer::Servant get_servant () override; - void set_servant (PortableServer::Servant servant); + void set_servant (PortableServer::Servant servant) override; - virtual TAO_SERVANT_LOCATION locate_servant ( + TAO_Servant_Location locate_servant ( const PortableServer::ObjectId &system_id, - PortableServer::Servant &servant); + PortableServer::Servant &servant) override; - virtual PortableServer::Servant locate_servant ( + PortableServer::Servant locate_servant ( const char *operation, const PortableServer::ObjectId &system_id, TAO::Portable_Server::Servant_Upcall &servant_upcall, TAO::Portable_Server::POA_Current_Impl &poa_current_impl, - bool &wait_occurred_restart_call); + bool &wait_occurred_restart_call) override; - virtual PortableServer::Servant system_id_to_servant ( - const PortableServer::ObjectId &system_id); + PortableServer::Servant system_id_to_servant ( + const PortableServer::ObjectId &system_id) override; - virtual PortableServer::Servant id_to_servant ( - const PortableServer::ObjectId &id); + PortableServer::Servant id_to_servant ( + const PortableServer::ObjectId &id) override; - virtual void cleanup_servant ( + void cleanup_servant ( PortableServer::Servant servant, - const PortableServer::ObjectId &user_id); + const PortableServer::ObjectId &user_id) override; - virtual void etherealize_objects (CORBA::Boolean etherealize_objects); + void etherealize_objects (CORBA::Boolean etherealize_objects) override; - virtual PortableServer::ObjectId *servant_to_id ( - PortableServer::Servant servant); + PortableServer::ObjectId *servant_to_id ( + PortableServer::Servant servant) override; - virtual void post_invoke_servant_cleanup( + void post_invoke_servant_cleanup( const PortableServer::ObjectId &system_id, - const TAO::Portable_Server::Servant_Upcall &servant_upcall); - - virtual ::PortableServer::RequestProcessingPolicyValue type() const; + const TAO::Portable_Server::Servant_Upcall &servant_upcall) override; private: - PortableServer::ServantBase_var default_servant_; + PortableServer::ServantBase_var default_servant_ {}; }; } } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp deleted file mode 100644 index b2a2250c04a..00000000000 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp +++ /dev/null @@ -1,68 +0,0 @@ -#include "tao/orbconf.h" - -#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - -#include "tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h" -#include "tao/PortableServer/RequestProcessingStrategy.h" -#include "tao/PortableServer/RequestProcessingStrategyDefaultServant.h" -#include "ace/Dynamic_Service.h" -#include "ace/Log_Msg.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace Portable_Server - { - RequestProcessingStrategy* - RequestProcessingStrategyDefaultServantFactoryImpl::create ( - ::PortableServer::RequestProcessingPolicyValue value, - ::PortableServer::ServantRetentionPolicyValue /*srvalue*/) - { - RequestProcessingStrategy* strategy = 0; - - switch (value) - { - case ::PortableServer::USE_DEFAULT_SERVANT : - { - ACE_NEW_RETURN (strategy, RequestProcessingStrategyDefaultServant, 0); - break; - } - default : - { - TAOLIB_ERROR ((LM_ERROR, "Incorrect type in RequestProcessingStrategyDefaultServantFactoryImpl")); - break; - } - } - - return strategy; - } - - void - RequestProcessingStrategyDefaultServantFactoryImpl::destroy ( - RequestProcessingStrategy *strategy) - { - strategy->strategy_cleanup (); - - delete strategy; - } - } -} - -ACE_STATIC_SVC_DEFINE ( - RequestProcessingStrategyDefaultServantFactoryImpl, - ACE_TEXT ("RequestProcessingStrategyDefaultServantFactory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (RequestProcessingStrategyDefaultServantFactoryImpl), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) - -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - RequestProcessingStrategyDefaultServantFactoryImpl, - TAO::Portable_Server::RequestProcessingStrategyDefaultServantFactoryImpl) - -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_HAS_MINIMUM_POA == 0 */ - diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h deleted file mode 100644 index 3fd7f737609..00000000000 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h +++ /dev/null @@ -1,54 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file RequestProcessingStrategyDefaultServantFI.h - * - * @author Johnny Willemsen - */ -//============================================================================= - -#ifndef TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYDEFAULTSERVANTFACTORYIMPL_H -#define TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYDEFAULTSERVANTFACTORYIMPL_H -#include /**/ "ace/pre.h" - -#include "tao/PortableServer/portableserver_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Service_Config.h" -#include "tao/PortableServer/RequestProcessingStrategyFactory.h" - -#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace Portable_Server - { - class TAO_PortableServer_Export RequestProcessingStrategyDefaultServantFactoryImpl - : public RequestProcessingStrategyFactory - { - public: - /// Create a new servant retention strategy - virtual RequestProcessingStrategy* create ( - ::PortableServer::RequestProcessingPolicyValue value, - ::PortableServer::ServantRetentionPolicyValue srvalue); - - virtual void destroy (RequestProcessingStrategy *strategy); - }; - } -} - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyDefaultServantFactoryImpl) -ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyDefaultServantFactoryImpl) - -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_HAS_MINIMUM_POA == 0 */ - -#include /**/ "ace/post.h" -#endif /* TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYDEFAULTSERVANTFACTORYIMPL_H*/ diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactory.h b/TAO/tao/PortableServer/RequestProcessingStrategyFactory.h deleted file mode 100644 index 24b9a9c8767..00000000000 --- a/TAO/tao/PortableServer/RequestProcessingStrategyFactory.h +++ /dev/null @@ -1,50 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file RequestProcessingStrategyFactory.h - * - * @author Johnny Willemsen - */ -//============================================================================= - -#ifndef TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYFACTORY_H -#define TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYFACTORY_H -#include /**/ "ace/pre.h" - -#include "tao/PortableServer/portableserver_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/PortableServer/StrategyFactory.h" -#include "tao/PortableServer/RequestProcessingPolicyC.h" -#include "tao/PortableServer/ServantRetentionPolicyC.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace Portable_Server - { - class RequestProcessingStrategy; - - class TAO_PortableServer_Export RequestProcessingStrategyFactory - : public StrategyFactory - { - public: - /// Create a new servant retention strategy - virtual RequestProcessingStrategy* create ( - ::PortableServer::RequestProcessingPolicyValue value, - ::PortableServer::ServantRetentionPolicyValue srvalue) = 0; - - virtual void destroy (RequestProcessingStrategy *strategy) = 0; - }; - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#include /**/ "ace/post.h" -#endif /* TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYFACTORY_H */ diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp deleted file mode 100644 index bd18a086ce7..00000000000 --- a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp +++ /dev/null @@ -1,141 +0,0 @@ -#include "tao/PortableServer/RequestProcessingStrategyFactoryImpl.h" -#include "tao/PortableServer/RequestProcessingStrategyAOMOnly.h" -#include "tao/PortableServer/RequestProcessingStrategyDefaultServant.h" -#include "tao/PortableServer/RequestProcessingStrategyServantLocator.h" -#include "tao/PortableServer/RequestProcessingStrategyServantActivator.h" -#include "ace/Dynamic_Service.h" -#include "ace/Log_Msg.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace Portable_Server - { - RequestProcessingStrategy* - RequestProcessingStrategyFactoryImpl::create ( - ::PortableServer::RequestProcessingPolicyValue value, - ::PortableServer::ServantRetentionPolicyValue srvalue) - { - RequestProcessingStrategy* strategy = 0; - RequestProcessingStrategyFactory *strategy_factory = 0; - - switch (value) - { - case ::PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY : - { - strategy_factory = - ACE_Dynamic_Service::instance ("RequestProcessingStrategyAOMOnlyFactory"); - - break; - } - case ::PortableServer::USE_DEFAULT_SERVANT : - { - strategy_factory = - ACE_Dynamic_Service::instance ("RequestProcessingStrategyDefaultServantFactory"); - - break; - } - case ::PortableServer::USE_SERVANT_MANAGER : - { -#if (TAO_HAS_MINIMUM_POA == 0) - switch (srvalue) - { - case ::PortableServer::RETAIN : - { - strategy_factory = - ACE_Dynamic_Service::instance ("RequestProcessingStrategyServantActivatorFactory"); - - break; - } - case ::PortableServer::NON_RETAIN : - { - strategy_factory = - ACE_Dynamic_Service::instance ("RequestProcessingStrategyServantLocatorFactory"); - - break; - } - } -#endif /* TAO_HAS_MINIMUM_POA == 0 */ - break; - } - } - - if (strategy_factory != 0) - strategy = strategy_factory->create (value, srvalue); - else - TAOLIB_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) %p\n"), - ACE_TEXT ("ERROR, Unable to get ") - ACE_TEXT ("RequestProcessingStrategyFactory"))); - - return strategy; - } - - void - RequestProcessingStrategyFactoryImpl::destroy ( - RequestProcessingStrategy *strategy) - { - RequestProcessingStrategyFactory *strategy_factory = 0; - - switch (strategy->type ()) - { - case ::PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY : - { - strategy_factory = - ACE_Dynamic_Service::instance ("RequestProcessingStrategyAOMOnlyFactory"); - - break; - } - case ::PortableServer::USE_DEFAULT_SERVANT : - { - strategy_factory = - ACE_Dynamic_Service::instance ("RequestProcessingStrategyDefaultServantFactory"); - - break; - } - case ::PortableServer::USE_SERVANT_MANAGER : - { -#if (TAO_HAS_MINIMUM_POA == 0) - switch (strategy->sr_type ()) - { - case ::PortableServer::RETAIN : - { - strategy_factory = - ACE_Dynamic_Service::instance ("RequestProcessingStrategyServantActivatorFactory"); - - break; - } - case ::PortableServer::NON_RETAIN : - { - strategy_factory = - ACE_Dynamic_Service::instance ("RequestProcessingStrategyServantLocatorFactory"); - break; - } - } -#endif /* TAO_HAS_MINIMUM_POA == 0 */ - break; - } - } - - if (strategy_factory != 0) - { - strategy_factory->destroy (strategy); - } - } - } -} - -ACE_STATIC_SVC_DEFINE ( - RequestProcessingStrategyFactoryImpl, - ACE_TEXT ("RequestProcessingStrategyFactory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (RequestProcessingStrategyFactoryImpl), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) - -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - RequestProcessingStrategyFactoryImpl, - TAO::Portable_Server::RequestProcessingStrategyFactoryImpl) -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h deleted file mode 100644 index 96ee26cf106..00000000000 --- a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h +++ /dev/null @@ -1,50 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file RequestProcessingStrategyFactoryImpl.h - * - * @author Johnny Willemsen - */ -//============================================================================= - -#ifndef TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYFACTORYIMPL_H -#define TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYFACTORYIMPL_H -#include /**/ "ace/pre.h" - -#include "tao/PortableServer/portableserver_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Service_Config.h" -#include "tao/PortableServer/RequestProcessingStrategyFactory.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace Portable_Server - { - class TAO_PortableServer_Export RequestProcessingStrategyFactoryImpl - : public RequestProcessingStrategyFactory - { - public: - virtual RequestProcessingStrategy* create ( - ::PortableServer::RequestProcessingPolicyValue value, - ::PortableServer::ServantRetentionPolicyValue srvalue); - - virtual void destroy (RequestProcessingStrategy *strategy); - }; - } -} - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyFactoryImpl) -ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyFactoryImpl) - -TAO_END_VERSIONED_NAMESPACE_DECL - - -#include /**/ "ace/post.h" -#endif /* TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYFACTORYIMPL_H */ diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp index 2ba133bb309..e07d39daf81 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp @@ -17,11 +17,6 @@ namespace TAO { namespace Portable_Server { - RequestProcessingStrategyServantActivator::RequestProcessingStrategyServantActivator () : - etherealize_objects_ (true) - { - } - void RequestProcessingStrategyServantActivator::strategy_cleanup () { @@ -61,20 +56,20 @@ namespace TAO this->validate_servant_manager (this->servant_activator_.in ()); } - TAO_SERVANT_LOCATION + TAO_Servant_Location RequestProcessingStrategyServantActivator::locate_servant ( const PortableServer::ObjectId &system_id, PortableServer::Servant &servant) { - TAO_SERVANT_LOCATION location = TAO_SERVANT_NOT_FOUND; + TAO_Servant_Location location = TAO_Servant_Location::Not_Found; location = this->poa_->servant_present (system_id, servant); - if (location == TAO_SERVANT_NOT_FOUND) + if (location == TAO_Servant_Location::Not_Found) { if (!CORBA::is_nil (this->servant_activator_.in ())) { - location = TAO_SERVANT_MANAGER; + location = TAO_Servant_Location::Servant_Manager; } } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h index c7675ae80a0..7d41bcf6b6f 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h @@ -34,34 +34,34 @@ namespace TAO : public RequestProcessingStrategyServantManager { public: - RequestProcessingStrategyServantActivator (); + RequestProcessingStrategyServantActivator () = default; - virtual void strategy_cleanup(); + void strategy_cleanup() override; - PortableServer::ServantManager_ptr get_servant_manager (); + PortableServer::ServantManager_ptr get_servant_manager () override; - void set_servant_manager (PortableServer::ServantManager_ptr imgr); + void set_servant_manager (PortableServer::ServantManager_ptr imgr) override; - virtual TAO_SERVANT_LOCATION locate_servant ( + TAO_Servant_Location locate_servant ( const PortableServer::ObjectId &system_id, - PortableServer::Servant &servant); + PortableServer::Servant &servant) override; - virtual PortableServer::Servant locate_servant ( + PortableServer::Servant locate_servant ( const char *operation, const PortableServer::ObjectId &system_id, TAO::Portable_Server::Servant_Upcall &servant_upcall, TAO::Portable_Server::POA_Current_Impl &poa_current_impl, - bool &wait_occurred_restart_call); + bool &wait_occurred_restart_call) override; - virtual void cleanup_servant ( + void cleanup_servant ( PortableServer::Servant servant, - const PortableServer::ObjectId &user_id); + const PortableServer::ObjectId &user_id) override; - virtual void etherealize_objects (CORBA::Boolean etherealize_objects); + void etherealize_objects (CORBA::Boolean etherealize_objects) override; - virtual void post_invoke_servant_cleanup( + void post_invoke_servant_cleanup( const PortableServer::ObjectId &system_id, - const TAO::Portable_Server::Servant_Upcall &servant_upcall); + const TAO::Portable_Server::Servant_Upcall &servant_upcall) override; private: PortableServer::Servant incarnate_servant ( @@ -73,7 +73,7 @@ namespace TAO private: PortableServer::ServantActivator_var servant_activator_; - CORBA::Boolean etherealize_objects_; + CORBA::Boolean etherealize_objects_ { true }; }; } } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp deleted file mode 100644 index 9d25c652d3a..00000000000 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp +++ /dev/null @@ -1,80 +0,0 @@ -#include "tao/orbconf.h" - -#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - -#include "tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h" -#include "tao/PortableServer/RequestProcessingStrategy.h" -#include "tao/PortableServer/RequestProcessingStrategyServantActivator.h" -#include "ace/Dynamic_Service.h" -#include "ace/Log_Msg.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace Portable_Server - { - RequestProcessingStrategy* - RequestProcessingStrategyServantActivatorFactoryImpl::create ( - ::PortableServer::RequestProcessingPolicyValue value, - ::PortableServer::ServantRetentionPolicyValue srvalue) - { - RequestProcessingStrategy* strategy = 0; - - switch (value) - { - case ::PortableServer::USE_SERVANT_MANAGER : - { - switch (srvalue) - { - case ::PortableServer::RETAIN : - { - ACE_NEW_RETURN (strategy, RequestProcessingStrategyServantActivator, 0); - break; - } - case ::PortableServer::NON_RETAIN : - { - TAOLIB_ERROR ((LM_ERROR, "Incorrect type in RequestProcessingStrategyServantActivatorFactoryImpl")); - break; - } - } - break; - } - default : - { - TAOLIB_ERROR ((LM_ERROR, "Incorrect type in RequestProcessingStrategyServantActivatorFactoryImpl")); - break; - } - } - - return strategy; - } - - void - RequestProcessingStrategyServantActivatorFactoryImpl::destroy ( - RequestProcessingStrategy *strategy) - { - strategy->strategy_cleanup (); - - delete strategy; - } - } -} - -ACE_STATIC_SVC_DEFINE ( - RequestProcessingStrategyServantActivatorFactoryImpl, - ACE_TEXT ("RequestProcessingStrategyServantActivatorFactory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (RequestProcessingStrategyServantActivatorFactoryImpl), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) - -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - RequestProcessingStrategyServantActivatorFactoryImpl, - TAO::Portable_Server::RequestProcessingStrategyServantActivatorFactoryImpl) - -TAO_END_VERSIONED_NAMESPACE_DECL - - -#endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h deleted file mode 100644 index b5bb15a8f98..00000000000 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h +++ /dev/null @@ -1,54 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file RequestProcessingStrategyServantActivatorFI.h - * - * @author Johnny Willemsen - */ -//============================================================================= - -#ifndef TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYSERVANTACTIVATORFACTORYIMPL_H -#define TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYSERVANTACTIVATORFACTORYIMPL_H -#include /**/ "ace/pre.h" - -#include "tao/PortableServer/portableserver_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Service_Config.h" -#include "tao/PortableServer/RequestProcessingStrategyFactory.h" - -#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace Portable_Server - { - class TAO_PortableServer_Export RequestProcessingStrategyServantActivatorFactoryImpl - : public RequestProcessingStrategyFactory - { - public: - /// Create a new servant retention strategy - virtual RequestProcessingStrategy* create ( - ::PortableServer::RequestProcessingPolicyValue value, - ::PortableServer::ServantRetentionPolicyValue srvalue); - - virtual void destroy (RequestProcessingStrategy *strategy); - }; - } -} - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyServantActivatorFactoryImpl) -ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyServantActivatorFactoryImpl) - -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_HAS_MINIMUM_POA == 0 */ - -#include /**/ "ace/post.h" -#endif /* TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYSERVANTACTIVATORFACTORYIMPL_H */ diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp index 01458939b75..40f660c33ee 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp @@ -17,10 +17,6 @@ namespace TAO { namespace Portable_Server { - RequestProcessingStrategyServantLocator::RequestProcessingStrategyServantLocator () - { - } - void RequestProcessingStrategyServantLocator::strategy_cleanup() { @@ -60,19 +56,18 @@ namespace TAO this->validate_servant_manager (this->servant_locator_.in ()); } - TAO_SERVANT_LOCATION + TAO_Servant_Location RequestProcessingStrategyServantLocator::locate_servant ( const PortableServer::ObjectId &system_id, PortableServer::Servant &servant) { - TAO_SERVANT_LOCATION location = - this->poa_->servant_present (system_id, servant); + TAO_Servant_Location location = this->poa_->servant_present (system_id, servant); - if (location == TAO_SERVANT_NOT_FOUND) + if (location == TAO_Servant_Location::Not_Found) { if (!CORBA::is_nil (this->servant_locator_.in ())) { - location = TAO_SERVANT_MANAGER; + location = TAO_Servant_Location::Servant_Manager; } } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h index 9cff43232f2..c6f8c3a4ff6 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h @@ -34,34 +34,34 @@ namespace TAO : public RequestProcessingStrategyServantManager { public: - RequestProcessingStrategyServantLocator (); + RequestProcessingStrategyServantLocator () = default; - virtual void strategy_cleanup(); + void strategy_cleanup() override; - PortableServer::ServantManager_ptr get_servant_manager (); + PortableServer::ServantManager_ptr get_servant_manager () override; - void set_servant_manager (PortableServer::ServantManager_ptr imgr); + void set_servant_manager (PortableServer::ServantManager_ptr imgr) override; - virtual TAO_SERVANT_LOCATION locate_servant ( + TAO_Servant_Location locate_servant ( const PortableServer::ObjectId &system_id, - PortableServer::Servant &servant); + PortableServer::Servant &servant) override; - virtual void post_invoke_servant_cleanup( + void post_invoke_servant_cleanup( const PortableServer::ObjectId &system_id, - const TAO::Portable_Server::Servant_Upcall &servant_upcall); + const TAO::Portable_Server::Servant_Upcall &servant_upcall) override; - virtual PortableServer::Servant locate_servant ( + PortableServer::Servant locate_servant ( const char *operation, const PortableServer::ObjectId &system_id, TAO::Portable_Server::Servant_Upcall &servant_upcall, TAO::Portable_Server::POA_Current_Impl &poa_current_impl, - bool &wait_occurred_restart_call); + bool &wait_occurred_restart_call) override; - virtual void cleanup_servant ( + void cleanup_servant ( PortableServer::Servant servant, - const PortableServer::ObjectId &user_id); + const PortableServer::ObjectId &user_id) override; - virtual void etherealize_objects (CORBA::Boolean etherealize_objects); + void etherealize_objects (CORBA::Boolean etherealize_objects) override; private: PortableServer::ServantLocator_var servant_locator_; diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp deleted file mode 100644 index 9da757ce489..00000000000 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp +++ /dev/null @@ -1,81 +0,0 @@ -// -*- C++ -*- -#include "tao/orbconf.h" - -#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - -#include "tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h" -#include "tao/PortableServer/RequestProcessingStrategy.h" -#include "tao/PortableServer/RequestProcessingStrategyServantLocator.h" -#include "ace/Dynamic_Service.h" -#include "ace/Log_Msg.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace Portable_Server - { - RequestProcessingStrategy* - RequestProcessingStrategyServantLocatorFactoryImpl::create ( - ::PortableServer::RequestProcessingPolicyValue value, - ::PortableServer::ServantRetentionPolicyValue srvalue) - { - RequestProcessingStrategy* strategy = 0; - - switch (value) - { - case ::PortableServer::USE_SERVANT_MANAGER : - { - switch (srvalue) - { - case ::PortableServer::RETAIN : - { - TAOLIB_ERROR ((LM_ERROR, "Incorrect type in RequestProcessingStrategyServantLocatorFactoryImpl")); - break; - } - case ::PortableServer::NON_RETAIN : - { - ACE_NEW_RETURN (strategy, RequestProcessingStrategyServantLocator, 0); - break; - } - } - break; - } - default : - { - TAOLIB_ERROR ((LM_ERROR, "Incorrect type in RequestProcessingStrategyServantLocatorFactoryImpl")); - break; - } - } - - return strategy; - } - - void - RequestProcessingStrategyServantLocatorFactoryImpl::destroy ( - RequestProcessingStrategy *strategy) - { - strategy->strategy_cleanup (); - - delete strategy; - } - } -} - -ACE_STATIC_SVC_DEFINE ( - RequestProcessingStrategyServantLocatorFactoryImpl, - ACE_TEXT ("RequestProcessingStrategyServantLocatorFactory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (RequestProcessingStrategyServantLocatorFactoryImpl), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) - -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - RequestProcessingStrategyServantLocatorFactoryImpl, - TAO::Portable_Server::RequestProcessingStrategyServantLocatorFactoryImpl) - -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_HAS_MINIMUM_POA == 0 */ - diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h deleted file mode 100644 index a114844ac8f..00000000000 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h +++ /dev/null @@ -1,54 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file RequestProcessingStrategyServantLocatorFI.h - * - * @author Johnny Willemsen - */ -//============================================================================= - -#ifndef TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYSERVANTLOCATORFACTORYIMPL_H -#define TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYSERVANTLOCATORFACTORYIMPL_H -#include /**/ "ace/pre.h" - -#include "tao/PortableServer/portableserver_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Service_Config.h" -#include "tao/PortableServer/RequestProcessingStrategyFactory.h" - -#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace Portable_Server - { - class TAO_PortableServer_Export RequestProcessingStrategyServantLocatorFactoryImpl - : public RequestProcessingStrategyFactory - { - public: - /// Create a new servant retention strategy - virtual RequestProcessingStrategy* create ( - ::PortableServer::RequestProcessingPolicyValue value, - ::PortableServer::ServantRetentionPolicyValue srvalue); - - virtual void destroy (RequestProcessingStrategy *strategy); - }; - } -} - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyServantLocatorFactoryImpl) -ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyServantLocatorFactoryImpl) - -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_HAS_MINIMUM_POA == 0 */ - -#include /**/ "ace/post.h" -#endif /* TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYSERVANTLOCATORFACTORYIMPL_H */ diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp index 6454c9ff55b..476258bcf68 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp @@ -14,10 +14,6 @@ namespace TAO { namespace Portable_Server { - RequestProcessingStrategyServantManager::RequestProcessingStrategyServantManager () - { - } - PortableServer::Servant RequestProcessingStrategyServantManager::get_servant () { @@ -63,12 +59,6 @@ namespace TAO { return this->poa_->user_id_to_servant_i (id); } - - ::PortableServer::RequestProcessingPolicyValue - RequestProcessingStrategyServantManager::type() const - { - return ::PortableServer::USE_SERVANT_MANAGER; - } } } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h index 420d9441072..65438cb07f7 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h @@ -33,25 +33,20 @@ namespace TAO : public RequestProcessingStrategy { public: - RequestProcessingStrategyServantManager (); + RequestProcessingStrategyServantManager () = default; - PortableServer::Servant get_servant (); + PortableServer::Servant get_servant () override; - void set_servant (PortableServer::Servant servant); + void set_servant (PortableServer::Servant servant) override; - void validate_servant_manager ( + virtual void validate_servant_manager ( PortableServer::ServantManager_ptr servant_manager); - virtual PortableServer::Servant system_id_to_servant ( - const PortableServer::ObjectId &system_id); + PortableServer::Servant system_id_to_servant (const PortableServer::ObjectId &system_id) override; - virtual PortableServer::Servant id_to_servant ( - const PortableServer::ObjectId &id); + PortableServer::Servant id_to_servant (const PortableServer::ObjectId &id) override; - virtual PortableServer::ObjectId *servant_to_id ( - PortableServer::Servant servant); - - virtual ::PortableServer::RequestProcessingPolicyValue type() const; + PortableServer::ObjectId *servant_to_id (PortableServer::Servant servant) override; }; } } diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp index a2ea413e806..049f891a4bf 100644 --- a/TAO/tao/PortableServer/Root_POA.cpp +++ b/TAO/tao/PortableServer/Root_POA.cpp @@ -258,11 +258,9 @@ TAO_Root_POA::TAO_Root_POA (const TAO_Root_POA::String &name, // minimum POA builds, remove this code and remove the guards // in Object_Adapter.cpp when changing the default policy for the // RootPOA. - if (ACE_OS::strcmp (this->name_.c_str (), - TAO_DEFAULT_ROOTPOA_NAME) == 0) + if (ACE_OS::strcmp (this->name_.c_str (), TAO_DEFAULT_ROOTPOA_NAME) == 0) { - this->cached_policies_.implicit_activation - (PortableServer::IMPLICIT_ACTIVATION); + this->cached_policies_.implicit_activation (PortableServer::IMPLICIT_ACTIVATION); } #endif /* TAO_HAS_MINIMUM_POA == 1 */ @@ -270,7 +268,7 @@ TAO_Root_POA::TAO_Root_POA (const TAO_Root_POA::String &name, this->active_policy_strategies_.update (this->cached_policies_, this); TAO::Portable_Server::Active_Policy_Strategies_Cleanup_Guard aps_cleanup_guard ( - &this->active_policy_strategies_); + std::addressof(this->active_policy_strategies_)); // Set the folded name of this POA. this->set_folded_name (parent); @@ -2189,7 +2187,7 @@ TAO_Root_POA::client_exposed_policies (CORBA::Short /* object_priority */) return policies._retn (); } -TAO_SERVANT_LOCATION +TAO_Servant_Location TAO_Root_POA::locate_servant_i (const PortableServer::ObjectId &system_id, PortableServer::Servant &servant) { @@ -2197,7 +2195,7 @@ TAO_Root_POA::locate_servant_i (const PortableServer::ObjectId &system_id, locate_servant (system_id, servant); } -TAO_SERVANT_LOCATION +TAO_Servant_Location TAO_Root_POA::servant_present (const PortableServer::ObjectId &system_id, PortableServer::Servant &servant) { diff --git a/TAO/tao/PortableServer/Root_POA.h b/TAO/tao/PortableServer/Root_POA.h index 317e4ce67f5..812a4b7d00e 100644 --- a/TAO/tao/PortableServer/Root_POA.h +++ b/TAO/tao/PortableServer/Root_POA.h @@ -391,7 +391,7 @@ public: PortableServer::Servant find_servant (const PortableServer::ObjectId &system_id); - TAO_SERVANT_LOCATION servant_present ( + TAO_Servant_Location servant_present ( const PortableServer::ObjectId &system_id, PortableServer::Servant &servant); @@ -620,7 +620,7 @@ protected: PortableInterceptor::ObjectReferenceFactory *current_factory); - TAO_SERVANT_LOCATION locate_servant_i (const PortableServer::ObjectId &id, + TAO_Servant_Location locate_servant_i (const PortableServer::ObjectId &id, PortableServer::Servant &servant); PortableServer::Servant locate_servant_i ( diff --git a/TAO/tao/PortableServer/ServantRetentionStrategy.cpp b/TAO/tao/PortableServer/ServantRetentionStrategy.cpp new file mode 100644 index 00000000000..81c33e627da --- /dev/null +++ b/TAO/tao/PortableServer/ServantRetentionStrategy.cpp @@ -0,0 +1,23 @@ +// -*- C++ -*- + +//============================================================================= +/** + * @file ServantRetentionStrategy.cpp + */ +//============================================================================= + +#include "tao/PortableServer/ServantRetentionStrategy.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +namespace TAO +{ + namespace Portable_Server + { + ServantRetentionStrategy::ServantRetentionStrategy () + { + } + } /* namespace Portable_Server */ +} /* namespace TAO */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ServantRetentionStrategy.h b/TAO/tao/PortableServer/ServantRetentionStrategy.h index 6873a3b8028..700616953f8 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategy.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategy.h @@ -12,13 +12,12 @@ #define TAO_SERVANTRETENTIONSTRATEGY_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/Policy_Strategy.h" +#include "tao/PortableServer/Servant_Location.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/Servant_Location.h" #include "tao/PortableServer/Servant_Upcall.h" #include "tao/PortableServer/ServantRetentionPolicyC.h" #include "tao/PortableServer/PortableServer.h" @@ -34,15 +33,21 @@ namespace TAO namespace Portable_Server { class ServantRetentionStrategy - : public Policy_Strategy { public: + ServantRetentionStrategy (); + virtual ~ServantRetentionStrategy () = default; + + virtual void strategy_init (TAO_Root_POA *poa); + + virtual void strategy_cleanup(); + virtual CORBA::ULong waiting_servant_deactivation () const = 0; virtual int is_servant_in_map (PortableServer::Servant servant, bool &wait_occurred_restart_call) = 0; - virtual TAO_SERVANT_LOCATION servant_present ( + virtual TAO_Servant_Location servant_present ( const PortableServer::ObjectId &system_id, PortableServer::Servant &servant) = 0; diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyFactory.h b/TAO/tao/PortableServer/ServantRetentionStrategyFactory.h deleted file mode 100644 index dce8425c22b..00000000000 --- a/TAO/tao/PortableServer/ServantRetentionStrategyFactory.h +++ /dev/null @@ -1,47 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file ServantRetentionStrategyFactory.h - * - * @author Johnny Willemsen - */ -//============================================================================= - -#ifndef TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYFACTORY_H -#define TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYFACTORY_H -#include /**/ "ace/pre.h" - -#include "tao/PortableServer/portableserver_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/PortableServer/StrategyFactory.h" -#include "tao/PortableServer/ServantRetentionPolicyC.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace Portable_Server - { - class ServantRetentionStrategy; - - class TAO_PortableServer_Export ServantRetentionStrategyFactory - : public StrategyFactory - { - public: - /// Create a new servant retention strategy - virtual ServantRetentionStrategy* create (::PortableServer::ServantRetentionPolicyValue value) = 0; - - virtual void destroy (ServantRetentionStrategy *strategy) = 0; - }; - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#include /**/ "ace/post.h" -#endif /* TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYFACTORY_H */ diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp deleted file mode 100644 index 71fa991e79a..00000000000 --- a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp +++ /dev/null @@ -1,95 +0,0 @@ -// -*- C++ -*- -#include "tao/PortableServer/ServantRetentionStrategyFactoryImpl.h" -#include "tao/PortableServer/ServantRetentionStrategy.h" -#include "tao/debug.h" -#include "ace/Dynamic_Service.h" -#include "ace/Log_Msg.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace Portable_Server - { - ServantRetentionStrategy* - ServantRetentionStrategyFactoryImpl::create ( - ::PortableServer::ServantRetentionPolicyValue value) - { - ServantRetentionStrategyFactory *strategy_factory = 0; - const char *strategy_factory_name = 0; - - switch (value) - { - case ::PortableServer::RETAIN : - { - strategy_factory_name = "ServantRetentionStrategyRetainFactory"; - break; - } - case ::PortableServer::NON_RETAIN : - { - strategy_factory_name = "ServantRetentionStrategyNonRetainFactory"; - break; - } - } - - strategy_factory = - ACE_Dynamic_Service::instance (strategy_factory_name); - - if (strategy_factory == 0) - { - if (TAO_debug_level > 1) - TAOLIB_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) ERROR, Unable to get %C\n"), - strategy_factory_name)); - - return 0; - } - - return strategy_factory->create (value); - } - - void - ServantRetentionStrategyFactoryImpl::destroy ( - ServantRetentionStrategy *strategy) - { - const char *strategy_factory_name = 0; - - switch (strategy->type ()) - { - case ::PortableServer::RETAIN : - { - strategy_factory_name = "ServantRetentionStrategyRetainFactory"; - break; - } - case ::PortableServer::NON_RETAIN : - { - strategy_factory_name = "ServantRetentionStrategyNonRetainFactory"; - break; - } - } - - ServantRetentionStrategyFactory *servantretention_strategy_factory = - ACE_Dynamic_Service::instance (strategy_factory_name); - - if (servantretention_strategy_factory != 0) - { - servantretention_strategy_factory->destroy (strategy); - } - } - } -} - -ACE_STATIC_SVC_DEFINE ( - ServantRetentionStrategyFactoryImpl, - ACE_TEXT ("ServantRetentionStrategyFactory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (ServantRetentionStrategyFactoryImpl), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) - -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - ServantRetentionStrategyFactoryImpl, - TAO::Portable_Server::ServantRetentionStrategyFactoryImpl) -TAO_END_VERSIONED_NAMESPACE_DECL - diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h deleted file mode 100644 index e73ae1ff4d5..00000000000 --- a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h +++ /dev/null @@ -1,48 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file ServantRetentionStrategyFactoryImpl.h - * - * @author Johnny Willemsen - */ -//============================================================================= - -#ifndef TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYFACTORYIMPL_H -#define TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYFACTORYIMPL_H -#include /**/ "ace/pre.h" - -#include "tao/PortableServer/portableserver_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Service_Config.h" -#include "tao/PortableServer/ServantRetentionStrategyFactory.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace Portable_Server - { - class TAO_PortableServer_Export ServantRetentionStrategyFactoryImpl - : public ServantRetentionStrategyFactory - { - public: - /// Create a new servant retention strategy - virtual ServantRetentionStrategy* create (::PortableServer::ServantRetentionPolicyValue value); - - virtual void destroy (ServantRetentionStrategy *strategy); - }; - } -} - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ServantRetentionStrategyFactoryImpl) -ACE_FACTORY_DECLARE (TAO_PortableServer, ServantRetentionStrategyFactoryImpl) - -TAO_END_VERSIONED_NAMESPACE_DECL - -#include /**/ "ace/post.h" -#endif /* TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYFACTORYIMPL_H */ diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp index e4e39fbe4bd..7fd93860d12 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp @@ -24,12 +24,6 @@ namespace TAO { namespace Portable_Server { - ServantRetentionStrategyNonRetain::ServantRetentionStrategyNonRetain () : - poa_ (0), - sys_id_count_ (0) - { - } - void ServantRetentionStrategyNonRetain::strategy_init (TAO_Root_POA *poa) { @@ -39,7 +33,7 @@ namespace TAO void ServantRetentionStrategyNonRetain::strategy_cleanup () { - poa_ = 0; + poa_ = nullptr; } void @@ -87,12 +81,12 @@ namespace TAO throw PortableServer::POA::WrongPolicy (); } - TAO_SERVANT_LOCATION + TAO_Servant_Location ServantRetentionStrategyNonRetain::servant_present ( const PortableServer::ObjectId &/*system_id*/, PortableServer::Servant &/*servant*/) { - return TAO_SERVANT_NOT_FOUND; + return TAO_Servant_Location::Not_Found; } PortableServer::Servant diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h index 8d2e46f5336..3365ec714fd 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h @@ -33,97 +33,88 @@ namespace TAO : public ServantRetentionStrategy { public: - ServantRetentionStrategyNonRetain (); + ServantRetentionStrategyNonRetain () = default; - virtual void strategy_init (TAO_Root_POA *poa); + void strategy_init (TAO_Root_POA *poa) override; - virtual void strategy_cleanup(); + void strategy_cleanup() override; CORBA::ULong waiting_servant_deactivation () const; - virtual PortableServer::ObjectId * activate_object (PortableServer::Servant servant, CORBA::Short priority, - bool &wait_occurred_restart_call); + bool &wait_occurred_restart_call) override; - virtual void activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant servant, CORBA::Short priority, - bool &wait_occurred_restart_call); + bool &wait_occurred_restart_call) override; - virtual void deactivate_object (const PortableServer::ObjectId &id); + void deactivate_object (const PortableServer::ObjectId &id) override; - virtual PortableServer::Servant find_servant ( - const PortableServer::ObjectId &system_id); + PortableServer::Servant find_servant ( + const PortableServer::ObjectId &system_id) override; - virtual int is_servant_in_map (PortableServer::Servant servant, - bool &wait_occurred_restart_call); + int is_servant_in_map (PortableServer::Servant servant, + bool &wait_occurred_restart_call) override; - virtual PortableServer::ObjectId *system_id_to_object_id ( - const PortableServer::ObjectId &system_id); + PortableServer::ObjectId *system_id_to_object_id ( + const PortableServer::ObjectId &system_id) override; - virtual PortableServer::Servant - user_id_to_servant (const PortableServer::ObjectId &id); + user_id_to_servant (const PortableServer::ObjectId &id) override; CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &id, bool indirect); - virtual TAO_SERVANT_LOCATION servant_present ( + TAO_Servant_Location servant_present ( const PortableServer::ObjectId &system_id, - PortableServer::Servant &servant); + PortableServer::Servant &servant) override; - virtual PortableServer::Servant find_servant ( + PortableServer::Servant find_servant ( const PortableServer::ObjectId &system_id, TAO::Portable_Server::Servant_Upcall &servant_upcall, - TAO::Portable_Server::POA_Current_Impl &poa_current_impl); + TAO::Portable_Server::POA_Current_Impl &poa_current_impl) override; - virtual int find_servant_priority ( + int find_servant_priority ( const PortableServer::ObjectId &system_id, - CORBA::Short &priority); + CORBA::Short &priority) override; - virtual void deactivate_all_objects (); + void deactivate_all_objects () override; - virtual PortableServer::ObjectId *servant_to_user_id ( - PortableServer::Servant servant); + PortableServer::ObjectId *servant_to_user_id (PortableServer::Servant servant) override; - virtual CORBA::Object_ptr servant_to_reference ( - PortableServer::Servant servant); + CORBA::Object_ptr servant_to_reference (PortableServer::Servant servant) override; - virtual CORBA::Object_ptr create_reference ( - const char *intf, - CORBA::Short priority); + CORBA::Object_ptr create_reference (const char *intf, CORBA::Short priority) override; #if !defined (CORBA_E_MICRO) - virtual CORBA::Object_ptr create_reference_with_id ( + CORBA::Object_ptr create_reference_with_id ( const PortableServer::ObjectId &oid, const char *intf, - CORBA::Short priority); + CORBA::Short priority) override; #endif - virtual int rebind_using_user_id_and_system_id ( + int rebind_using_user_id_and_system_id ( PortableServer::Servant servant, const PortableServer::ObjectId &user_id, const PortableServer::ObjectId &system_id, - TAO::Portable_Server::Servant_Upcall &servant_upcall); + TAO::Portable_Server::Servant_Upcall &servant_upcall) override; - virtual CORBA::Boolean servant_has_remaining_activations ( - PortableServer::Servant servant); + CORBA::Boolean servant_has_remaining_activations (PortableServer::Servant servant) override; - virtual int unbind_using_user_id ( - const PortableServer::ObjectId &user_id); + int unbind_using_user_id (const PortableServer::ObjectId &user_id) override; - virtual ::PortableServer::ServantRetentionPolicyValue type() const; + ::PortableServer::ServantRetentionPolicyValue type() const override; - virtual TAO_Active_Object_Map * get_active_object_map() const; + TAO_Active_Object_Map * get_active_object_map() const override; protected: - TAO_Root_POA *poa_; - std::atomic sys_id_count_; + TAO_Root_POA *poa_ {}; + std::atomic sys_id_count_ { 0 }; }; } } diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp deleted file mode 100644 index 5d5881e9582..00000000000 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp +++ /dev/null @@ -1,65 +0,0 @@ -#include "tao/orbconf.h" - -#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - -#include "tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h" -#include "tao/PortableServer/ServantRetentionStrategy.h" -#include "tao/PortableServer/ServantRetentionStrategyNonRetain.h" -#include "ace/Dynamic_Service.h" -#include "ace/Log_Msg.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace Portable_Server - { - ServantRetentionStrategy* - ServantRetentionStrategyNonRetainFactoryImpl::create ( - ::PortableServer::ServantRetentionPolicyValue value) - { - ServantRetentionStrategy* strategy = 0; - - switch (value) - { - case ::PortableServer::NON_RETAIN : - { - ACE_NEW_RETURN (strategy, ServantRetentionStrategyNonRetain, 0); - break; - } - case ::PortableServer::RETAIN : - { - TAOLIB_ERROR ((LM_ERROR, "Incorrect type in ServantRetentionStrategyNonRetainFactoryImpl")); - break; - } - } - - return strategy; - } - - void - ServantRetentionStrategyNonRetainFactoryImpl::destroy ( - ServantRetentionStrategy *strategy) - { - strategy->strategy_cleanup (); - - delete strategy; - } - } -} - -ACE_STATIC_SVC_DEFINE ( - ServantRetentionStrategyNonRetainFactoryImpl, - ACE_TEXT ("ServantRetentionStrategyNonRetainFactory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (ServantRetentionStrategyNonRetainFactoryImpl), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) - -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - ServantRetentionStrategyNonRetainFactoryImpl, - TAO::Portable_Server::ServantRetentionStrategyNonRetainFactoryImpl) -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_HAS_MINIMUM_POA == 0 && !CORBA_E_COMPACT && !CORBA_E_MICRO */ diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h deleted file mode 100644 index f4003e80207..00000000000 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h +++ /dev/null @@ -1,52 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file ServantRetentionStrategyNonRetainFactoryImpl.h - * - * @author Johnny Willemsen - */ -//============================================================================= - -#ifndef TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYNONRETAIN_FACTORYIMPL_H -#define TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYNONRETAIN_FACTORYIMPL_H -#include /**/ "ace/pre.h" - -#include "tao/PortableServer/portableserver_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Service_Config.h" -#include "tao/PortableServer/ServantRetentionStrategyFactory.h" - -#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace Portable_Server - { - class TAO_PortableServer_Export ServantRetentionStrategyNonRetainFactoryImpl - : public ServantRetentionStrategyFactory - { - public: - /// Create a new servant retention strategy - virtual ServantRetentionStrategy* create (::PortableServer::ServantRetentionPolicyValue value); - - virtual void destroy (ServantRetentionStrategy *strategy); - }; - } -} - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ServantRetentionStrategyNonRetainFactoryImpl) -ACE_FACTORY_DECLARE (TAO_PortableServer, ServantRetentionStrategyNonRetainFactoryImpl) - -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_HAS_MINIMUM_POA == 0 */ - -#include /**/ "ace/post.h" -#endif /* TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYNONRETAIN_FACTORYIMPL_H*/ diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp index efcd7935078..292e13dfcd2 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp @@ -26,13 +26,6 @@ namespace TAO { namespace Portable_Server { - ServantRetentionStrategyRetain::ServantRetentionStrategyRetain () : - ServantRetentionStrategyNonRetain (), - active_object_map_ (), - waiting_servant_deactivation_ (0) - { - } - void ServantRetentionStrategyRetain::strategy_init (TAO_Root_POA *poa) { @@ -234,7 +227,7 @@ namespace TAO } } - TAO_SERVANT_LOCATION + TAO_Servant_Location ServantRetentionStrategyRetain::servant_present ( const PortableServer::ObjectId &system_id, PortableServer::Servant &servant) @@ -256,11 +249,11 @@ namespace TAO if (result == 0) { // Success - return TAO_SERVANT_FOUND; + return TAO_Servant_Location::Found; } else { - return TAO_SERVANT_NOT_FOUND; + return TAO_Servant_Location::Not_Found; } } @@ -961,13 +954,6 @@ namespace TAO return this->active_object_map_->remaining_activations (servant); } - - ::PortableServer::ServantRetentionPolicyValue - ServantRetentionStrategyRetain::type() const - { - return ::PortableServer::RETAIN; - } - TAO_Active_Object_Map * ServantRetentionStrategyRetain::get_active_object_map() const { diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h index a475bdb69ac..22eefd38cd1 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h @@ -18,7 +18,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Auto_Ptr.h" +#include "tao/PortableServer/Active_Object_Map.h" +#include TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -32,82 +33,67 @@ namespace TAO : public ServantRetentionStrategyNonRetain { public: - ServantRetentionStrategyRetain (); + ServantRetentionStrategyRetain () = default; - CORBA::ULong waiting_servant_deactivation () const; + CORBA::ULong waiting_servant_deactivation () const override; - virtual void strategy_init (TAO_Root_POA *poa); + void strategy_init (TAO_Root_POA *poa) override; - virtual void strategy_cleanup(); + void strategy_cleanup() override; - virtual int is_servant_in_map (PortableServer::Servant servant, - bool &wait_occurred_restart_call); + int is_servant_in_map (PortableServer::Servant servant, + bool &wait_occurred_restart_call) override; - virtual PortableServer::ObjectId * activate_object (PortableServer::Servant servant, CORBA::Short priority, - bool &wait_occurred_restart_call); + bool &wait_occurred_restart_call) override; - virtual void activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant servant, CORBA::Short priority, - bool &wait_occurred_restart_call); + bool &wait_occurred_restart_call) override; - void deactivate_object (const PortableServer::ObjectId &id); + void deactivate_object (const PortableServer::ObjectId &id) override; - virtual PortableServer::Servant find_servant ( - const PortableServer::ObjectId &system_id); + PortableServer::Servant find_servant (const PortableServer::ObjectId &system_id) override; - virtual PortableServer::ObjectId * system_id_to_object_id ( - const PortableServer::ObjectId &system_id); + PortableServer::ObjectId * system_id_to_object_id (const PortableServer::ObjectId &system_id) override; - virtual - PortableServer::Servant - user_id_to_servant (const PortableServer::ObjectId &id); + PortableServer::Servant user_id_to_servant (const PortableServer::ObjectId &id) override; CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &id, - bool indirect); + bool indirect) override; - virtual - TAO_SERVANT_LOCATION + TAO_Servant_Location servant_present (const PortableServer::ObjectId &system_id, - PortableServer::Servant &servant); + PortableServer::Servant &servant) override; - virtual PortableServer::Servant find_servant ( + PortableServer::Servant find_servant ( const PortableServer::ObjectId &system_id, TAO::Portable_Server::Servant_Upcall &servant_upcall, - TAO::Portable_Server::POA_Current_Impl &poa_current_impl); + TAO::Portable_Server::POA_Current_Impl &poa_current_impl) override; - virtual int find_servant_priority ( + int find_servant_priority ( const PortableServer::ObjectId &system_id, - CORBA::Short &priority); + CORBA::Short &priority) override; - virtual void deactivate_all_objects (); + void deactivate_all_objects () override; - virtual PortableServer::ObjectId *servant_to_user_id ( - PortableServer::Servant servant); + PortableServer::ObjectId *servant_to_user_id (PortableServer::Servant servant) override; - virtual - CORBA::Object_ptr servant_to_reference (PortableServer::Servant servant); + CORBA::Object_ptr servant_to_reference (PortableServer::Servant servant) override; - virtual - CORBA::Object_ptr create_reference ( - const char *intf, - CORBA::Short priority); + CORBA::Object_ptr create_reference (const char *intf, CORBA::Short priority) override; #if !defined (CORBA_E_MICRO) - virtual CORBA::Object_ptr create_reference_with_id ( const PortableServer::ObjectId &oid, const char *intf, - CORBA::Short priority); + CORBA::Short priority) override; #endif - virtual ::PortableServer::ServantRetentionPolicyValue type() const; - protected: int is_user_id_in_map (const PortableServer::ObjectId &id, @@ -122,25 +108,23 @@ namespace TAO PortableServer::Servant p_servant, CORBA::Short &priority); - virtual int rebind_using_user_id_and_system_id ( PortableServer::Servant servant, const PortableServer::ObjectId &user_id, const PortableServer::ObjectId &system_id, - TAO::Portable_Server::Servant_Upcall &servant_upcall); + TAO::Portable_Server::Servant_Upcall &servant_upcall) override; - virtual CORBA::Boolean servant_has_remaining_activations ( - PortableServer::Servant servant); + PortableServer::Servant servant) override; - virtual int unbind_using_user_id ( - const PortableServer::ObjectId &user_id); + int unbind_using_user_id ( + const PortableServer::ObjectId &user_id) override; TAO_Active_Object_Map * get_active_object_map() const; private: std::unique_ptr active_object_map_; - CORBA::ULong waiting_servant_deactivation_; + CORBA::ULong waiting_servant_deactivation_ { 0 } ; }; } } diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp deleted file mode 100644 index ab5b254407c..00000000000 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp +++ /dev/null @@ -1,60 +0,0 @@ -// -*- C++ -*- -#include "tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h" -#include "tao/PortableServer/ServantRetentionStrategy.h" -#include "tao/PortableServer/ServantRetentionStrategyRetain.h" -#include "ace/Dynamic_Service.h" -#include "ace/Log_Msg.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace Portable_Server - { - ServantRetentionStrategy* - ServantRetentionStrategyRetainFactoryImpl::create ( - ::PortableServer::ServantRetentionPolicyValue value) - { - ServantRetentionStrategy* strategy = 0; - - switch (value) - { - case ::PortableServer::RETAIN : - { - ACE_NEW_RETURN (strategy, ServantRetentionStrategyRetain, 0); - break; - } - case ::PortableServer::NON_RETAIN : - { - TAOLIB_ERROR ((LM_ERROR, "Incorrect type in ServantRetentionStrategyNonRetainFactoryImpl")); - break; - } - } - - return strategy; - } - - void - ServantRetentionStrategyRetainFactoryImpl::destroy ( - ServantRetentionStrategy *strategy) - { - strategy->strategy_cleanup (); - - delete strategy; - } - } -} - -ACE_STATIC_SVC_DEFINE ( - ServantRetentionStrategyRetainFactoryImpl, - ACE_TEXT ("ServantRetentionStrategyRetainFactory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (ServantRetentionStrategyRetainFactoryImpl), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) - -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - ServantRetentionStrategyRetainFactoryImpl, - TAO::Portable_Server::ServantRetentionStrategyRetainFactoryImpl) -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h deleted file mode 100644 index 1a2d964250a..00000000000 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h +++ /dev/null @@ -1,49 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file ServantRetentionStrategyRetainFactoryImpl.h - * - * @author Johnny Willemsen - */ -//============================================================================= - -#ifndef TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYRETAIN_FACTORYIMPL_H -#define TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYRETAIN_FACTORYIMPL_H -#include /**/ "ace/pre.h" - -#include "tao/PortableServer/portableserver_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Service_Config.h" -#include "tao/PortableServer/ServantRetentionStrategyFactory.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace Portable_Server - { - class TAO_PortableServer_Export ServantRetentionStrategyRetainFactoryImpl - : public ServantRetentionStrategyFactory - { - public: - /// Create a new servant retention strategy - virtual ServantRetentionStrategy* create (::PortableServer::ServantRetentionPolicyValue value); - - virtual void destroy (ServantRetentionStrategy *strategy); - }; - } -} - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ServantRetentionStrategyRetainFactoryImpl) -ACE_FACTORY_DECLARE (TAO_PortableServer, ServantRetentionStrategyRetainFactoryImpl) - -TAO_END_VERSIONED_NAMESPACE_DECL - - -#include /**/ "ace/post.h" -#endif /* TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYRETAIN_FACTORYIMPL_H*/ diff --git a/TAO/tao/PortableServer/Servant_Location.h b/TAO/tao/PortableServer/Servant_Location.h index 2946650b2bf..e9eefbaac43 100644 --- a/TAO/tao/PortableServer/Servant_Location.h +++ b/TAO/tao/PortableServer/Servant_Location.h @@ -8,8 +8,8 @@ */ //============================================================================= -#ifndef TAO_SERVANT_LOCATION_H -#define TAO_SERVANT_LOCATION_H +#ifndef TAO_Servant_Location_H +#define TAO_Servant_Location_H #include /**/ "ace/pre.h" @@ -23,16 +23,16 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -enum TAO_SERVANT_LOCATION +enum class TAO_Servant_Location { - TAO_SERVANT_FOUND, - TAO_DEFAULT_SERVANT, - TAO_SERVANT_MANAGER, - TAO_SERVANT_NOT_FOUND + Found, + Default_Servant, + Servant_Manager, + Not_Found }; TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" -#endif /* TAO_SERVANT_LOCATION_H */ +#endif /* TAO_Servant_Location_H */ diff --git a/TAO/tao/PortableServer/Servant_Upcall.cpp b/TAO/tao/PortableServer/Servant_Upcall.cpp index ecad0576c2e..ae36b5d7486 100644 --- a/TAO/tao/PortableServer/Servant_Upcall.cpp +++ b/TAO/tao/PortableServer/Servant_Upcall.cpp @@ -403,7 +403,7 @@ namespace TAO ex._tao_print_exception ("TAO_POA::~complete_destruction_i"); } - this->poa_ = 0; + this->poa_ = nullptr; } } } diff --git a/TAO/tao/PortableServer/ThreadStrategy.cpp b/TAO/tao/PortableServer/ThreadStrategy.cpp deleted file mode 100644 index 647081f0660..00000000000 --- a/TAO/tao/PortableServer/ThreadStrategy.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include "tao/PortableServer/ThreadStrategy.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace Portable_Server - { - void - ThreadStrategy::strategy_init (TAO_Root_POA * /*poa*/) - { - } - - void - ThreadStrategy::strategy_cleanup () - { - } - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ThreadStrategy.h b/TAO/tao/PortableServer/ThreadStrategy.h index 289c9dcd214..6ad68bcb0cd 100644 --- a/TAO/tao/PortableServer/ThreadStrategy.h +++ b/TAO/tao/PortableServer/ThreadStrategy.h @@ -12,13 +12,12 @@ #define TAO_THREAD_STRATEGY_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/Policy_Strategy.h" +#include "tao/PortableServer/ThreadPolicyC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/ThreadPolicyC.h" #include "tao/orbconf.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -28,18 +27,14 @@ namespace TAO namespace Portable_Server { class ThreadStrategy - : public Policy_Strategy { public: + ThreadStrategy () = default; + virtual ~ThreadStrategy () = default; + virtual int enter () = 0; virtual int exit () = 0; - - void strategy_init (TAO_Root_POA *poa) override; - - void strategy_cleanup() override; - - virtual ::PortableServer::ThreadPolicyValue type() const = 0; }; } } diff --git a/TAO/tao/PortableServer/ThreadStrategyFactory.h b/TAO/tao/PortableServer/ThreadStrategyFactory.h deleted file mode 100644 index bac43806fa1..00000000000 --- a/TAO/tao/PortableServer/ThreadStrategyFactory.h +++ /dev/null @@ -1,49 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file ThreadStrategyFactory.h - * - * @author Johnny Willemsen - */ -//============================================================================= - -#ifndef TAO_PORTABLESERVER_THREADPOLICYSTRATEGYFACTORY_H -#define TAO_PORTABLESERVER_THREADPOLICYSTRATEGYFACTORY_H - -#include /**/ "ace/pre.h" - -#include "tao/PortableServer/StrategyFactory.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/PortableServer/ThreadPolicyC.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace Portable_Server - { - class ThreadStrategy; - - class ThreadStrategyFactory - : public StrategyFactory - { - public: - /// Create a new servant retention strategy - virtual ThreadStrategy *create (::PortableServer::ThreadPolicyValue value) = 0; - - /// Cleanup the given strategy instance - virtual void destroy (ThreadStrategy *strategy) = 0; - }; - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#include /**/ "ace/post.h" - -#endif /* TAO_PORTABLESERVER_THREADPOLICYSTRATEGYFACTORY_H */ diff --git a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp deleted file mode 100644 index 908513d3cb4..00000000000 --- a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp +++ /dev/null @@ -1,95 +0,0 @@ -#include "tao/PortableServer/ThreadStrategyFactoryImpl.h" -#include "tao/PortableServer/ThreadStrategy.h" -#include "ace/Dynamic_Service.h" -#include "ace/Log_Msg.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace Portable_Server - { - ThreadStrategy* - ThreadStrategyFactoryImpl::create ( - ::PortableServer::ThreadPolicyValue value) - { - ThreadStrategy* strategy = 0; - - switch (value) - { - case ::PortableServer::SINGLE_THREAD_MODEL : - { - ThreadStrategyFactory *strategy_factory = - ACE_Dynamic_Service::instance ("ThreadStrategySingleFactory"); - - if (strategy_factory) - { - strategy = strategy_factory->create (value); - } - else - TAOLIB_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) %p\n"), - ACE_TEXT ("ERROR, Unable to get ") - ACE_TEXT ("ThreadStrategySingleFactory"))); - - break; - } - case ::PortableServer::ORB_CTRL_MODEL : - { - strategy = - ACE_Dynamic_Service::instance ("ThreadStrategyORBControl"); - - if (!strategy) - TAOLIB_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) %p\n"), - ACE_TEXT ("ERROR, Unable to get ") - ACE_TEXT ("ThreadStrategyORBControl"))); - - break; - } - } - - return strategy; - } - - void - ThreadStrategyFactoryImpl::destroy ( - ThreadStrategy *strategy) - { - switch (strategy->type ()) - { - case ::PortableServer::SINGLE_THREAD_MODEL : - { - ThreadStrategyFactory *strategy_factory = - ACE_Dynamic_Service::instance ("ThreadStrategySingleFactory"); - - if (strategy_factory) - { - strategy_factory->destroy (strategy); - } - break; - } - case ::PortableServer::ORB_CTRL_MODEL : - { - // Noop - break; - } - } - } - } -} - -ACE_STATIC_SVC_DEFINE ( - ThreadStrategyFactoryImpl, - ACE_TEXT ("ThreadStrategyFactory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (ThreadStrategyFactoryImpl), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) - -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - ThreadStrategyFactoryImpl, - TAO::Portable_Server::ThreadStrategyFactoryImpl) - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h deleted file mode 100644 index 666793af2fd..00000000000 --- a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h +++ /dev/null @@ -1,48 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file ThreadStrategyFactoryImpl.h - * - * @author Johnny Willemsen - */ -//============================================================================= - -#ifndef TAO_PORTABLESERVER_THREADPOLICYSTRATEGYFACTORYIMPL_H -#define TAO_PORTABLESERVER_THREADPOLICYSTRATEGYFACTORYIMPL_H -#include /**/ "ace/pre.h" - -#include "tao/PortableServer/portableserver_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Service_Config.h" -#include "tao/PortableServer/ThreadStrategyFactory.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace Portable_Server - { - class TAO_PortableServer_Export ThreadStrategyFactoryImpl - : public ThreadStrategyFactory - { - public: - /// Create a new servant retention strategy - ThreadStrategy* create (::PortableServer::ThreadPolicyValue value) override; - - void destroy (ThreadStrategy *strategy) override; - }; - } -} - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ThreadStrategyFactoryImpl) -ACE_FACTORY_DECLARE (TAO_PortableServer, ThreadStrategyFactoryImpl) - -TAO_END_VERSIONED_NAMESPACE_DECL - -#include /**/ "ace/post.h" -#endif /* TAO_PORTABLESERVER_THREADPOLICYSTRATEGYFACTORYIMPL_H */ diff --git a/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp b/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp index aa99de625fe..bdd833456cd 100644 --- a/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp +++ b/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp @@ -19,25 +19,7 @@ namespace TAO { return 0; } - - ::PortableServer::ThreadPolicyValue - ThreadStrategyORBControl::type () const - { - return ::PortableServer::ORB_CTRL_MODEL; - } } } -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - ThreadStrategyORBControl, - TAO::Portable_Server::ThreadStrategyORBControl) - -ACE_STATIC_SVC_DEFINE ( - ThreadStrategyORBControl, - ACE_TEXT ("ThreadStrategyORBControl"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (ThreadStrategyORBControl), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ThreadStrategyORBControl.h b/TAO/tao/PortableServer/ThreadStrategyORBControl.h index 1bf7c0cf336..af3db329d0c 100644 --- a/TAO/tao/PortableServer/ThreadStrategyORBControl.h +++ b/TAO/tao/PortableServer/ThreadStrategyORBControl.h @@ -13,15 +13,13 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "tao/PortableServer/ThreadStrategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/ThreadStrategy.h" #include "tao/orbconf.h" -#include "ace/Service_Config.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -29,22 +27,16 @@ namespace TAO { namespace Portable_Server { - class ThreadStrategyORBControl - : public ThreadStrategy + class ThreadStrategyORBControl : public ThreadStrategy { public: int enter () override; int exit () override; - - ::PortableServer::ThreadPolicyValue type() const override; }; } } -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ThreadStrategyORBControl) -ACE_FACTORY_DECLARE (TAO_PortableServer, ThreadStrategyORBControl) - TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/ThreadStrategySingle.cpp b/TAO/tao/PortableServer/ThreadStrategySingle.cpp index 6f58c76f9ec..08f0dba3b63 100644 --- a/TAO/tao/PortableServer/ThreadStrategySingle.cpp +++ b/TAO/tao/PortableServer/ThreadStrategySingle.cpp @@ -3,7 +3,6 @@ #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) #include "tao/PortableServer/ThreadStrategySingle.h" -#include "ace/Dynamic_Service.h" #include "ace/Log_Msg.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -23,27 +22,9 @@ namespace TAO { return lock_.release(); } - - ::PortableServer::ThreadPolicyValue - ThreadStrategySingle::type() const - { - return ::PortableServer::SINGLE_THREAD_MODEL; - } } } -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - ThreadStrategySingle, - TAO::Portable_Server::ThreadStrategySingle) - -ACE_STATIC_SVC_DEFINE ( - ThreadStrategySingle, - ACE_TEXT ("ThreadStrategySingle"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (ThreadStrategySingle), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/ThreadStrategySingle.h b/TAO/tao/PortableServer/ThreadStrategySingle.h index 87962311eb7..29baed0bedb 100644 --- a/TAO/tao/PortableServer/ThreadStrategySingle.h +++ b/TAO/tao/PortableServer/ThreadStrategySingle.h @@ -38,24 +38,18 @@ namespace TAO { namespace Portable_Server { - class TAO_PortableServer_Export ThreadStrategySingle : - public ThreadStrategy + class ThreadStrategySingle : public ThreadStrategy { public: int enter () override; int exit () override; - - ::PortableServer::ThreadPolicyValue type() const override; private: TAO_SYNCH_RECURSIVE_MUTEX lock_; }; } } -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ThreadStrategySingle) -ACE_FACTORY_DECLARE (TAO_PortableServer, ThreadStrategySingle) - TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp deleted file mode 100644 index 8b9f2a898d2..00000000000 --- a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp +++ /dev/null @@ -1,64 +0,0 @@ -#include "tao/orbconf.h" - -#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - -#include "tao/PortableServer/ThreadStrategySingleFactoryImpl.h" -#include "tao/PortableServer/ThreadStrategy.h" -#include "tao/PortableServer/ThreadStrategySingle.h" -#include "ace/Dynamic_Service.h" -#include "ace/Log_Msg.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace Portable_Server - { - ThreadStrategy* - ThreadStrategySingleFactoryImpl::create ( - ::PortableServer::ThreadPolicyValue value) - { - ThreadStrategy* strategy = 0; - - switch (value) - { - case ::PortableServer::SINGLE_THREAD_MODEL : - { - ACE_NEW_RETURN (strategy, ThreadStrategySingle, 0); - break; - } - case ::PortableServer::ORB_CTRL_MODEL : - { - TAOLIB_ERROR ((LM_ERROR, "Incorrect type in ThreadStrategySingleFactoryImpl")); - break; - } - } - - return strategy; - } - - void - ThreadStrategySingleFactoryImpl::destroy (ThreadStrategy *strategy) - { - strategy->strategy_cleanup (); - - delete strategy; - } - } -} - -ACE_STATIC_SVC_DEFINE ( - ThreadStrategySingleFactoryImpl, - ACE_TEXT ("ThreadStrategySingleFactory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (ThreadStrategySingleFactoryImpl), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) - -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - ThreadStrategySingleFactoryImpl, - TAO::Portable_Server::ThreadStrategySingleFactoryImpl) -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h deleted file mode 100644 index 2dbf0a018bc..00000000000 --- a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h +++ /dev/null @@ -1,52 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file ThreadStrategySingleFactoryImpl.h - * - * @author Johnny Willemsen - */ -//============================================================================= - -#ifndef TAO_PORTABLESERVER_THREADPOLICYSINGLESTRATEGYFACTORYIMPL_H -#define TAO_PORTABLESERVER_THREADPOLICYSINGLESTRATEGYFACTORYIMPL_H -#include /**/ "ace/pre.h" - -#include "tao/PortableServer/portableserver_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Service_Config.h" -#include "tao/PortableServer/ThreadStrategyFactory.h" - -#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace Portable_Server - { - class ThreadStrategySingleFactoryImpl - : public ThreadStrategyFactory - { - public: - /// Create a new thread strategy - ThreadStrategy* create (::PortableServer::ThreadPolicyValue value) override; - - void destroy (ThreadStrategy *strategy) override; - }; - } -} - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ThreadStrategySingleFactoryImpl) -ACE_FACTORY_DECLARE (TAO_PortableServer, ThreadStrategySingleFactoryImpl) - -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_HAS_MINIMUM_POA == 0 */ - -#include /**/ "ace/post.h" -#endif /* TAO_PORTABLESERVER_THREADPOLICYSINGLESTRATEGYFACTORYIMPL_H*/ -- cgit v1.2.1 From 4db6c4351dfd785f59a9b16122e52eeec44520c0 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 13 Feb 2023 12:30:59 +0100 Subject: Fixed unresolved exports, more override * ACE/protocols/ace/HTBP/HTBP_Addr.cpp: * ACE/protocols/ace/HTBP/HTBP_Addr.h: * TAO/tao/PortableServer/Active_Object_Map.cpp: * TAO/tao/PortableServer/Active_Object_Map.h: * TAO/tao/PortableServer/Active_Policy_Strategies.h: * TAO/tao/PortableServer/Active_Policy_Strategies.inl: * TAO/tao/PortableServer/IdUniquenessStrategy.h: * TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp: * TAO/tao/PortableServer/Operation_Table_Binary_Search.h: * TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h: * TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp: * TAO/tao/PortableServer/Operation_Table_Linear_Search.h: * TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp: * TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h: * TAO/tao/PortableServer/POA_Current_Factory.cpp: * TAO/tao/PortableServer/POA_Current_Impl.cpp: * TAO/tao/PortableServer/POA_Current_Impl.h: * TAO/tao/PortableServer/POA_Policy_Set.h: * TAO/tao/PortableServer/ServantRetentionStrategy.h: --- ACE/protocols/ace/HTBP/HTBP_Addr.cpp | 6 ----- ACE/protocols/ace/HTBP/HTBP_Addr.h | 2 +- TAO/tao/PortableServer/Active_Object_Map.cpp | 26 ---------------------- TAO/tao/PortableServer/Active_Object_Map.h | 12 +++++----- TAO/tao/PortableServer/Active_Policy_Strategies.h | 1 - .../PortableServer/Active_Policy_Strategies.inl | 3 +-- TAO/tao/PortableServer/IdUniquenessStrategy.h | 4 ++-- .../Operation_Table_Binary_Search.cpp | 4 ---- .../PortableServer/Operation_Table_Binary_Search.h | 20 ++++++++--------- .../PortableServer/Operation_Table_Dynamic_Hash.h | 20 ++++++++--------- .../Operation_Table_Linear_Search.cpp | 4 ---- .../PortableServer/Operation_Table_Linear_Search.h | 20 ++++++++--------- .../Operation_Table_Perfect_Hash.cpp | 5 ----- .../PortableServer/Operation_Table_Perfect_Hash.h | 23 +++++++++---------- TAO/tao/PortableServer/POA_Current_Factory.cpp | 4 ++-- TAO/tao/PortableServer/POA_Current_Impl.cpp | 3 +-- TAO/tao/PortableServer/POA_Current_Impl.h | 2 +- TAO/tao/PortableServer/POA_Policy_Set.h | 2 +- TAO/tao/PortableServer/ServantRetentionStrategy.h | 4 ++-- 19 files changed, 58 insertions(+), 107 deletions(-) diff --git a/ACE/protocols/ace/HTBP/HTBP_Addr.cpp b/ACE/protocols/ace/HTBP/HTBP_Addr.cpp index fdc13f56090..182fa4f1fbc 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Addr.cpp +++ b/ACE/protocols/ace/HTBP/HTBP_Addr.cpp @@ -3,14 +3,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -// Constructor -ACE::HTBP::Addr::Addr () -{ -} - // Creates a ACE_INET_Addr from a PORT_NUMBER and the remote // HOST_NAME. - ACE::HTBP::Addr::Addr (u_short port_number, const char host_name[], int address_family) diff --git a/ACE/protocols/ace/HTBP/HTBP_Addr.h b/ACE/protocols/ace/HTBP/HTBP_Addr.h index 3484700dc53..21e6ec35303 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Addr.h +++ b/ACE/protocols/ace/HTBP/HTBP_Addr.h @@ -41,7 +41,7 @@ namespace ACE { public: /// Constructor - Addr (); + Addr () = default; Addr (const Addr &other); diff --git a/TAO/tao/PortableServer/Active_Object_Map.cpp b/TAO/tao/PortableServer/Active_Object_Map.cpp index 9f626b82f58..1ddf7e457cd 100644 --- a/TAO/tao/PortableServer/Active_Object_Map.cpp +++ b/TAO/tao/PortableServer/Active_Object_Map.cpp @@ -377,10 +377,6 @@ TAO_Active_Object_Map::is_user_id_in_map ( //////////////////////////////////////////////////////////////////////////////// -TAO_Id_Uniqueness_Strategy::~TAO_Id_Uniqueness_Strategy () -{ -} - void TAO_Id_Uniqueness_Strategy::set_active_object_map ( TAO_Active_Object_Map *active_object_map) @@ -790,10 +786,6 @@ TAO_Multiple_Id_Strategy::remaining_activations ( } #endif -TAO_Lifespan_Strategy::~TAO_Lifespan_Strategy () -{ -} - void TAO_Lifespan_Strategy::set_active_object_map ( TAO_Active_Object_Map *active_object_map) @@ -913,10 +905,6 @@ TAO_Active_Object_Map_Entry *&entry) } #endif -TAO_Id_Assignment_Strategy::~TAO_Id_Assignment_Strategy () -{ -} - void TAO_Id_Assignment_Strategy::set_active_object_map ( TAO_Active_Object_Map *active_object_map) @@ -1071,21 +1059,11 @@ TAO_System_Id_With_Multiple_Id_Strategy::bind_using_system_id ( //////////////////////////////////////////////////////////////////////////////// -TAO_Id_Hint_Strategy::~TAO_Id_Hint_Strategy () -{ -} - -//////////////////////////////////////////////////////////////////////////////// - TAO_Active_Hint_Strategy::TAO_Active_Hint_Strategy (CORBA::ULong map_size) : system_id_map_ (map_size) { } -TAO_Active_Hint_Strategy::~TAO_Active_Hint_Strategy () -{ -} - int TAO_Active_Hint_Strategy::recover_key ( const PortableServer::ObjectId &system_id, @@ -1135,10 +1113,6 @@ TAO_Active_Hint_Strategy::system_id (PortableServer::ObjectId_out system_id, //////////////////////////////////////////////////////////////////////////////// -TAO_No_Hint_Strategy::~TAO_No_Hint_Strategy () -{ -} - int TAO_No_Hint_Strategy::recover_key (const PortableServer::ObjectId &system_id, PortableServer::ObjectId &user_id) diff --git a/TAO/tao/PortableServer/Active_Object_Map.h b/TAO/tao/PortableServer/Active_Object_Map.h index b4eb5ef21ea..d9c99565c45 100644 --- a/TAO/tao/PortableServer/Active_Object_Map.h +++ b/TAO/tao/PortableServer/Active_Object_Map.h @@ -277,7 +277,7 @@ class TAO_Id_Uniqueness_Strategy { public: /// Virtual destructor. - virtual ~TAO_Id_Uniqueness_Strategy (); + virtual ~TAO_Id_Uniqueness_Strategy () = default; /// Must be used with UNIQUE_ID policy. virtual int @@ -432,7 +432,7 @@ class TAO_Lifespan_Strategy { public: /// Virtual destructor. - virtual ~TAO_Lifespan_Strategy (); + virtual ~TAO_Lifespan_Strategy () = default; /// Can be used with any policy. virtual int @@ -503,7 +503,7 @@ class TAO_Id_Assignment_Strategy { public: /// Virtual destructor. - virtual ~TAO_Id_Assignment_Strategy (); + virtual ~TAO_Id_Assignment_Strategy () = default; /// Must be used with SYSTEM_ID policy. virtual int @@ -589,7 +589,7 @@ class TAO_Id_Hint_Strategy { public: /// Virtual destructor. - virtual ~TAO_Id_Hint_Strategy (); + virtual ~TAO_Id_Hint_Strategy () = default; /// Find the user id from the system id. virtual int @@ -632,7 +632,7 @@ public: TAO_Active_Hint_Strategy (CORBA::ULong map_size); /// Virtual destructor. - virtual ~TAO_Active_Hint_Strategy (); + virtual ~TAO_Active_Hint_Strategy () = default; virtual int recover_key (const PortableServer::ObjectId &system_id, @@ -674,7 +674,7 @@ class TAO_No_Hint_Strategy : public TAO_Id_Hint_Strategy { public: /// Virtual destructor. - virtual ~TAO_No_Hint_Strategy (); + virtual ~TAO_No_Hint_Strategy () = default; virtual int recover_key (const PortableServer::ObjectId &system_id, diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.h b/TAO/tao/PortableServer/Active_Policy_Strategies.h index f05fbba535c..9f982b3998e 100644 --- a/TAO/tao/PortableServer/Active_Policy_Strategies.h +++ b/TAO/tao/PortableServer/Active_Policy_Strategies.h @@ -100,7 +100,6 @@ namespace TAO Active_Policy_Strategies_Cleanup_Guard () = delete; Active_Policy_Strategies_Cleanup_Guard (Active_Policy_Strategies *p); ~Active_Policy_Strategies_Cleanup_Guard (); - Active_Policy_Strategies *_retn (); private: diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.inl b/TAO/tao/PortableServer/Active_Policy_Strategies.inl index 0f1e51fb0eb..78f1b33b63e 100644 --- a/TAO/tao/PortableServer/Active_Policy_Strategies.inl +++ b/TAO/tao/PortableServer/Active_Policy_Strategies.inl @@ -62,8 +62,7 @@ namespace TAO } ACE_INLINE - Active_Policy_Strategies_Cleanup_Guard - ::~Active_Policy_Strategies_Cleanup_Guard () + Active_Policy_Strategies_Cleanup_Guard::~Active_Policy_Strategies_Cleanup_Guard () { if (this->ptr_) { diff --git a/TAO/tao/PortableServer/IdUniquenessStrategy.h b/TAO/tao/PortableServer/IdUniquenessStrategy.h index 7098f64e59e..323356245ea 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategy.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategy.h @@ -32,9 +32,9 @@ namespace TAO IdUniquenessStrategy (); virtual ~IdUniquenessStrategy () = default; - virtual void strategy_init (TAO_Root_POA *poa); + virtual void strategy_init (TAO_Root_POA *poa) = 0; - virtual void strategy_cleanup (); + virtual void strategy_cleanup () = 0; /* * Validate if the servant may be activated diff --git a/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp b/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp index a36d050310a..0810f667852 100644 --- a/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp +++ b/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp @@ -26,10 +26,6 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Operation_Table_Timeprobe_Description, TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Binary_Search_OpTable::~TAO_Binary_Search_OpTable () -{ -} - int TAO_Binary_Search_OpTable::find (const char *opname, TAO_Skeleton &skelfunc, diff --git a/TAO/tao/PortableServer/Operation_Table_Binary_Search.h b/TAO/tao/PortableServer/Operation_Table_Binary_Search.h index 0d45423ff0d..741d3f4da1c 100644 --- a/TAO/tao/PortableServer/Operation_Table_Binary_Search.h +++ b/TAO/tao/PortableServer/Operation_Table_Binary_Search.h @@ -39,20 +39,20 @@ class TAO_PortableServer_Export TAO_Binary_Search_OpTable { public: /// Do nothing destructor. - virtual ~TAO_Binary_Search_OpTable (); + ~TAO_Binary_Search_OpTable () override = default; /// See the documentation in the base class for details. - virtual int find (const char *opname, - TAO_Skeleton &skelfunc, - const unsigned int length = 0); + int find (const char *opname, + TAO_Skeleton &skelfunc, + const unsigned int length = 0) override; - virtual int find (const char *opname, - TAO_Collocated_Skeleton &skelfunc, - TAO::Collocation_Strategy s, - const unsigned int length = 0); + int find (const char *opname, + TAO_Collocated_Skeleton &skelfunc, + TAO::Collocation_Strategy s, + const unsigned int length = 0) override; - virtual int bind (const char *opname, - const TAO::Operation_Skeletons skel_ptr); + int bind (const char *opname, + const TAO::Operation_Skeletons skel_ptr) override; private: /// Method that should defined by the subclasses. GPERF program diff --git a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h index c2c421691f2..9959710c633 100644 --- a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h +++ b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h @@ -49,20 +49,20 @@ public: ACE_Allocator *alloc); /// Destructor - ~TAO_Dynamic_Hash_OpTable (); + ~TAO_Dynamic_Hash_OpTable () override; /// See the documentation in the base class for details. - virtual int bind (const char *opname, - const TAO::Operation_Skeletons skel_ptr); + int bind (const char *opname, + const TAO::Operation_Skeletons skel_ptr) override; - virtual int find (const char *opname, - TAO_Skeleton &skelfunc, - const unsigned int length = 0); + int find (const char *opname, + TAO_Skeleton &skelfunc, + const unsigned int length = 0) override; - virtual int find (const char *opname, - TAO_Collocated_Skeleton &skelfunc, - TAO::Collocation_Strategy s, - const unsigned int length = 0); + int find (const char *opname, + TAO_Collocated_Skeleton &skelfunc, + TAO::Collocation_Strategy s, + const unsigned int length = 0) override; private: typedef ACE_Hash_Map_Manager_Ex Date: Mon, 13 Feb 2023 12:43:48 +0100 Subject: Use override/default for RTPortableServer * TAO/NEWS: * TAO/tao/RTPortableServer/RT_Acceptor_Filters.h: * TAO/tao/RTPortableServer/RT_Collocation_Resolver.h: * TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.h: * TAO/tao/RTPortableServer/RT_POA.cpp: * TAO/tao/RTPortableServer/RT_POA.h: * TAO/tao/RTPortableServer/RT_Policy_Validator.h: * TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp: * TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h: --- TAO/NEWS | 3 + TAO/tao/RTPortableServer/RT_Acceptor_Filters.h | 4 +- TAO/tao/RTPortableServer/RT_Collocation_Resolver.h | 2 +- .../RTPortableServer/RT_Object_Adapter_Factory.h | 2 +- TAO/tao/RTPortableServer/RT_POA.cpp | 7 +- TAO/tao/RTPortableServer/RT_POA.h | 102 ++++++++++----------- TAO/tao/RTPortableServer/RT_Policy_Validator.h | 4 +- TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp | 4 - TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h | 10 +- 9 files changed, 66 insertions(+), 72 deletions(-) diff --git a/TAO/NEWS b/TAO/NEWS index a65cd83348f..23f0ed8a665 100644 --- a/TAO/NEWS +++ b/TAO/NEWS @@ -1,6 +1,9 @@ USER VISIBLE CHANGES BETWEEN TAO-3.0.11 and TAO-3.1.0 ===================================================== +. Removed usage of ACE service configurator for all + POA internal strategy classes + USER VISIBLE CHANGES BETWEEN TAO-3.0.10 and TAO-3.0.11 ====================================================== diff --git a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h index 5a90d176b41..bb87e9dad19 100644 --- a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h +++ b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h @@ -52,11 +52,11 @@ public: TAO_MProfile &mprofile, TAO_Acceptor **acceptors_begin, TAO_Acceptor **acceptors_end, - CORBA::Short priority); + CORBA::Short priority) override; /// Encodes the endpoints in the profiles into the TAO_TAG_ENDPOINTS /// tag component of profiles. - int encode_endpoints (TAO_MProfile &mprofile); + int encode_endpoints (TAO_MProfile &mprofile) override; private: /// Value of the ServerProtocolPolicy used for endpoint diff --git a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h index bf32bc4fccc..457615bfdaf 100644 --- a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h +++ b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h @@ -41,7 +41,7 @@ class TAO_RTPortableServer_Export TAO_RT_Collocation_Resolver : { public: /// Is @a object collocated? - virtual CORBA::Boolean is_collocated (CORBA::Object_ptr object) const; + CORBA::Boolean is_collocated (CORBA::Object_ptr object) const override; }; diff --git a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.h b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.h index 2709e4d3ec6..6e1ac24df2a 100644 --- a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.h +++ b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.h @@ -32,7 +32,7 @@ class TAO_RTPortableServer_Export TAO_RT_Object_Adapter_Factory { public: /// Create adapter. - virtual TAO_Adapter *create (TAO_ORB_Core *orb_core); + TAO_Adapter *create (TAO_ORB_Core *orb_core) override; }; diff --git a/TAO/tao/RTPortableServer/RT_POA.cpp b/TAO/tao/RTPortableServer/RT_POA.cpp index 0ead61fa6d7..93b27235ac6 100644 --- a/TAO/tao/RTPortableServer/RT_POA.cpp +++ b/TAO/tao/RTPortableServer/RT_POA.cpp @@ -45,17 +45,12 @@ TAO_RT_POA::TAO_RT_POA (const TAO_Root_POA::String &name, lock, thread_lock, orb_core, - object_adapter), - thread_pool_ (0) + object_adapter) { // Parse the RT policies and update our policy cache. this->parse_rt_policies (this->policies ()); } -TAO_RT_POA::~TAO_RT_POA () -{ -} - TAO_Root_POA * TAO_RT_POA::new_POA (const String &name, PortableServer::POAManager_ptr poa_manager, diff --git a/TAO/tao/RTPortableServer/RT_POA.h b/TAO/tao/RTPortableServer/RT_POA.h index 4c510007cb3..62420daa053 100644 --- a/TAO/tao/RTPortableServer/RT_POA.h +++ b/TAO/tao/RTPortableServer/RT_POA.h @@ -50,129 +50,129 @@ class TAO_RTPortableServer_Export TAO_RT_POA public: // RTCORBA specific methods CORBA::Object_ptr create_reference_with_priority (const char * intf, - RTCORBA::Priority priority); + RTCORBA::Priority priority) override; #if !defined (CORBA_E_MICRO) CORBA::Object_ptr create_reference_with_id_and_priority (const PortableServer::ObjectId & oid, const char * intf, - RTCORBA::Priority priority); + RTCORBA::Priority priority) override; #endif PortableServer::ObjectId * activate_object_with_priority (PortableServer::Servant p_servant, - RTCORBA::Priority priority); + RTCORBA::Priority priority) override; #if !defined (CORBA_E_MICRO) void activate_object_with_id_and_priority (const PortableServer::ObjectId & oid, PortableServer::Servant p_servant, - RTCORBA::Priority priority); + RTCORBA::Priority priority) override; #endif // End RTCORBA specific methods // Standard POA interface methods PortableServer::POA_ptr create_POA (const char *adapter_name, PortableServer::POAManager_ptr poa_manager, - const CORBA::PolicyList &policies); + const CORBA::PolicyList &policies) override; PortableServer::POA_ptr find_POA (const char *adapter_name, - CORBA::Boolean activate_it); + CORBA::Boolean activate_it) override; void destroy (CORBA::Boolean etherealize_objects, - CORBA::Boolean wait_for_completion); + CORBA::Boolean wait_for_completion) override; #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::ThreadPolicy_ptr create_thread_policy ( - PortableServer::ThreadPolicyValue value); + PortableServer::ThreadPolicyValue value) override; #endif /* TAO_HAS_MINIMUM_POA == 0 */ #if !defined (CORBA_E_MICRO) PortableServer::LifespanPolicy_ptr create_lifespan_policy ( - PortableServer::LifespanPolicyValue value); + PortableServer::LifespanPolicyValue value) override; #endif #if !defined (CORBA_E_MICRO) PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy ( - PortableServer::IdUniquenessPolicyValue value); + PortableServer::IdUniquenessPolicyValue value) override; #endif #if !defined (CORBA_E_MICRO) PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy ( - PortableServer::IdAssignmentPolicyValue value); + PortableServer::IdAssignmentPolicyValue value) override; #endif #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy ( - PortableServer::ImplicitActivationPolicyValue value); + PortableServer::ImplicitActivationPolicyValue value) override; PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy ( - PortableServer::ServantRetentionPolicyValue value); + PortableServer::ServantRetentionPolicyValue value) override; PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy ( - PortableServer::RequestProcessingPolicyValue value); + PortableServer::RequestProcessingPolicyValue value) override; #endif /* TAO_HAS_MINIMUM_POA == 0 && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */ - char * the_name (); + char * the_name () override; - PortableServer::POA_ptr the_parent (); + PortableServer::POA_ptr the_parent () override; - PortableServer::POAList *the_children (); + PortableServer::POAList *the_children () override; - PortableServer::POAManager_ptr the_POAManager (); + PortableServer::POAManager_ptr the_POAManager () override; #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - PortableServer::AdapterActivator_ptr the_activator (); + PortableServer::AdapterActivator_ptr the_activator () override; - void the_activator (PortableServer::AdapterActivator_ptr adapter_activator); + void the_activator (PortableServer::AdapterActivator_ptr adapter_activator) override; - PortableServer::ServantManager_ptr get_servant_manager (); + PortableServer::ServantManager_ptr get_servant_manager () override; - void set_servant_manager (PortableServer::ServantManager_ptr imgr); + void set_servant_manager (PortableServer::ServantManager_ptr imgr) override; - PortableServer::Servant get_servant (); + PortableServer::Servant get_servant () override; - void set_servant (PortableServer::Servant servant); + void set_servant (PortableServer::Servant servant) override; #endif /* TAO_HAS_MINIMUM_POA == 0 */ - PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant); + PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant) override; #if !defined (CORBA_E_MICRO) void activate_object_with_id (const PortableServer::ObjectId &id, - PortableServer::Servant p_servant); + PortableServer::Servant p_servant) override; #endif - void deactivate_object (const PortableServer::ObjectId &oid); + void deactivate_object (const PortableServer::ObjectId &oid) override; - CORBA::Object_ptr create_reference (const char *intf); + CORBA::Object_ptr create_reference (const char *intf) override; #if !defined (CORBA_E_MICRO) CORBA::Object_ptr create_reference_with_id (const PortableServer::ObjectId &oid, - const char *intf); + const char *intf) override; #endif - PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant); + PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant) override; - CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant); + CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant) override; - PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference); + PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference) override; - PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference); + PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference) override; - PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid); + PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid) override; - CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid); + CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid) override; - CORBA::OctetSeq *id (); + CORBA::OctetSeq *id () override; // End standard POA interface methods. - virtual CORBA::PolicyList *client_exposed_policies (CORBA::Short object_priority); + CORBA::PolicyList *client_exposed_policies (CORBA::Short object_priority) override; TAO_RT_POA (const String &name, PortableServer::POAManager_ptr poa_manager, @@ -183,24 +183,24 @@ public: TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter); - virtual ~TAO_RT_POA (); + ~TAO_RT_POA () override = default; void *thread_pool () const; protected: /// Template method for creating new POA's of this type. - virtual TAO_Root_POA *new_POA (const String &name, - PortableServer::POAManager_ptr poa_manager, - const TAO_POA_Policy_Set &policies, - TAO_Root_POA *parent, - ACE_Lock &lock, - TAO_SYNCH_MUTEX &thread_lock, - TAO_ORB_Core &orb_core, - TAO_Object_Adapter *object_adapter); - - virtual TAO_Stub *key_to_stub_i (const TAO::ObjectKey &key, - const char *type_id, - CORBA::Short priority); + TAO_Root_POA *new_POA (const String &name, + PortableServer::POAManager_ptr poa_manager, + const TAO_POA_Policy_Set &policies, + TAO_Root_POA *parent, + ACE_Lock &lock, + TAO_SYNCH_MUTEX &thread_lock, + TAO_ORB_Core &orb_core, + TAO_Object_Adapter *object_adapter) override; + + TAO_Stub *key_to_stub_i (const TAO::ObjectKey &key, + const char *type_id, + CORBA::Short priority) override; void validate_priority (RTCORBA::Priority priority); @@ -221,7 +221,7 @@ protected: int lane_required (TAO_Thread_Lane *lane, TAO_PriorityBandedConnectionPolicy *priority_bands); - TAO_Thread_Pool *thread_pool_; + TAO_Thread_Pool *thread_pool_ {}; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTPortableServer/RT_Policy_Validator.h b/TAO/tao/RTPortableServer/RT_Policy_Validator.h index 49e445e4dca..2fcf68be954 100644 --- a/TAO/tao/RTPortableServer/RT_Policy_Validator.h +++ b/TAO/tao/RTPortableServer/RT_Policy_Validator.h @@ -42,7 +42,7 @@ public: TAO_POA_RT_Policy_Validator (TAO_ORB_Core &orb_core); /// Destructor. - ~TAO_POA_RT_Policy_Validator () = default; + ~TAO_POA_RT_Policy_Validator () override = default; static RTCORBA::ServerProtocolPolicy_ptr server_protocol_policy_from_thread_pool (TAO_Thread_Pool *thread_pool, TAO_ORB_Core &orb_core); @@ -71,7 +71,7 @@ protected: * potentially specify policies that are unknown to an * validate () routine, and these need to be caught. */ - virtual CORBA::Boolean legal_policy_impl (CORBA::PolicyType type); + CORBA::Boolean legal_policy_impl (CORBA::PolicyType type) override; private: void validate_server_protocol (TAO_Policy_Set &policies); diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp index c49c6019527..e3faefbd69d 100644 --- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp +++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp @@ -24,10 +24,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_RT_Servant_Dispatcher::~TAO_RT_Servant_Dispatcher () -{ -} - void TAO_RT_Servant_Dispatcher::pre_invoke_remote_request ( TAO_Root_POA &poa, diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h index dd7df712e50..4806ddf6609 100644 --- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h +++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h @@ -39,22 +39,22 @@ class TAO_RTPortableServer_Export TAO_RT_Servant_Dispatcher : public TAO_Servant_Dispatcher { public: - virtual ~TAO_RT_Servant_Dispatcher (); + ~TAO_RT_Servant_Dispatcher () override = default; /// Pre_invoke remote request. void pre_invoke_remote_request (TAO_Root_POA &poa, CORBA::Short servant_priority, TAO_ServerRequest &req, - TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state); + TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state) override; /// Pre_invoke collocated request. void pre_invoke_collocated_request (TAO_Root_POA &poa, CORBA::Short servant_priority, - TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state); + TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state) override; /// Post_invoke request. void post_invoke (TAO_Root_POA &poa, - TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state); + TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state) override; /// Factory method for creating new POA's. TAO_Root_POA *create_Root_POA (const ACE_CString &name, @@ -63,7 +63,7 @@ public: ACE_Lock &lock, TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, - TAO_Object_Adapter *object_adapter); + TAO_Object_Adapter *object_adapter) override; }; TAO_END_VERSIONED_NAMESPACE_DECL -- cgit v1.2.1 From 5a66fa9c3a3c1d265808ee2049dabaef4bf1a3db Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 13 Feb 2023 14:01:06 +0100 Subject: Check for nil pointers in cleanup * TAO/tao/PortableServer/Active_Policy_Strategies.cpp: --- .../PortableServer/Active_Policy_Strategies.cpp | 28 +++++++++++++++------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.cpp b/TAO/tao/PortableServer/Active_Policy_Strategies.cpp index b457efcdc4f..a2a2ce4319b 100644 --- a/TAO/tao/PortableServer/Active_Policy_Strategies.cpp +++ b/TAO/tao/PortableServer/Active_Policy_Strategies.cpp @@ -42,22 +42,22 @@ namespace TAO this->create (policies.request_processing(), policies.servant_retention()); /**/ - if (this->lifespan_strategy_ != 0) + if (this->lifespan_strategy_) { this->lifespan_strategy_->strategy_init (poa); } - if (this->request_processing_strategy_ != 0) + if (this->request_processing_strategy_) { this->request_processing_strategy_->strategy_init (poa); } - if (this->id_uniqueness_strategy_ != 0) + if (this->id_uniqueness_strategy_) { this->id_uniqueness_strategy_->strategy_init (poa); } - if (this->servant_retention_strategy_ != 0) + if (this->servant_retention_strategy_) { this->servant_retention_strategy_->strategy_init (poa); } @@ -66,15 +66,27 @@ namespace TAO void Active_Policy_Strategies::cleanup () { - this->lifespan_strategy_->strategy_cleanup (); + if (this->lifespan_strategy_) + { + this->lifespan_strategy_->strategy_cleanup (); + } this->lifespan_strategy_.reset (nullptr); - this->request_processing_strategy_->strategy_cleanup (); + if (this->request_processing_strategy_) + { + this->request_processing_strategy_->strategy_cleanup (); + } this->request_processing_strategy_.reset (nullptr); - this->id_uniqueness_strategy_->strategy_cleanup (); + if (this->id_uniqueness_strategy_) + { + this->id_uniqueness_strategy_->strategy_cleanup (); + } this->id_uniqueness_strategy_.reset (nullptr); this->implicit_activation_strategy_.reset (nullptr); this->thread_strategy_.reset (nullptr); - this->servant_retention_strategy_->strategy_cleanup (); + if (this->servant_retention_strategy_) + { + this->servant_retention_strategy_->strategy_cleanup (); + } this->servant_retention_strategy_.reset (nullptr); this->id_assignment_strategy_.reset (nullptr); } -- cgit v1.2.1 From 8c215112dfc278f704ba37db8699a829f9cabf3a Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 13 Feb 2023 14:13:15 +0100 Subject: Compile fixes * TAO/tao/PortableServer/Active_Policy_Strategies.h: * TAO/tao/PortableServer/ThreadStrategy.h: --- TAO/tao/PortableServer/Active_Policy_Strategies.h | 15 ++++++++------- TAO/tao/PortableServer/ThreadStrategy.h | 3 +-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.h b/TAO/tao/PortableServer/Active_Policy_Strategies.h index 9f982b3998e..c0ff0e06b21 100644 --- a/TAO/tao/PortableServer/Active_Policy_Strategies.h +++ b/TAO/tao/PortableServer/Active_Policy_Strategies.h @@ -28,6 +28,14 @@ #include "tao/PortableServer/ImplicitActivationPolicyC.h" #include "tao/PortableServer/RequestProcessingPolicyC.h" +#include "tao/PortableServer/ThreadStrategy.h" +#include "tao/PortableServer/IdAssignmentStrategy.h" +#include "tao/PortableServer/IdUniquenessStrategy.h" +#include "tao/PortableServer/ImplicitActivationStrategy.h" +#include "tao/PortableServer/LifespanStrategy.h" +#include "tao/PortableServer/RequestProcessingStrategy.h" +#include "tao/PortableServer/ServantRetentionStrategy.h" + TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Root_POA; @@ -37,13 +45,6 @@ namespace TAO namespace Portable_Server { class Cached_Policies; - class ThreadStrategy; - class RequestProcessingStrategy; - class IdAssignmentStrategy; - class LifespanStrategy; - class IdUniquenessStrategy; - class ImplicitActivationStrategy; - class ServantRetentionStrategy; /** * This class stores the active policy strategies used for a certain POA. diff --git a/TAO/tao/PortableServer/ThreadStrategy.h b/TAO/tao/PortableServer/ThreadStrategy.h index 6ad68bcb0cd..5ee79a7a354 100644 --- a/TAO/tao/PortableServer/ThreadStrategy.h +++ b/TAO/tao/PortableServer/ThreadStrategy.h @@ -12,13 +12,12 @@ #define TAO_THREAD_STRATEGY_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/ThreadPolicyC.h" +#include "tao/orbconf.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/orbconf.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL -- cgit v1.2.1 From 48b96dee6147efa609f1536296929489203f3193 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 13 Feb 2023 14:16:16 +0100 Subject: Another default destructor * TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp: * TAO/tao/PortableServer/Acceptor_Filter_Factory.h: --- TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp | 4 ---- TAO/tao/PortableServer/Acceptor_Filter_Factory.h | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp b/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp index c052494c862..38e3b9a251e 100644 --- a/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp +++ b/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp @@ -6,10 +6,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Acceptor_Filter_Factory::~TAO_Acceptor_Filter_Factory() -{ -} - TAO_Acceptor_Filter* TAO_Acceptor_Filter_Factory::create_object (TAO_POA_Manager& ) { diff --git a/TAO/tao/PortableServer/Acceptor_Filter_Factory.h b/TAO/tao/PortableServer/Acceptor_Filter_Factory.h index 88fa02f2182..f408dba8b73 100644 --- a/TAO/tao/PortableServer/Acceptor_Filter_Factory.h +++ b/TAO/tao/PortableServer/Acceptor_Filter_Factory.h @@ -50,7 +50,7 @@ class TAO_PortableServer_Export TAO_Acceptor_Filter_Factory : public ACE_Service_Object { public: - virtual ~TAO_Acceptor_Filter_Factory(); + ~TAO_Acceptor_Filter_Factory() override = default; virtual TAO_Acceptor_Filter* create_object (TAO_POA_Manager& poamanager); -- cgit v1.2.1 From 53cabe442f3b082ee21458dfa2095fd0b5b0ba6b Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 13 Feb 2023 14:33:33 +0100 Subject: Use default * TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp: * TAO/tao/PortableServer/Default_Acceptor_Filter.cpp: * TAO/tao/PortableServer/Default_Acceptor_Filter.h: --- TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp | 4 ++-- TAO/tao/PortableServer/Default_Acceptor_Filter.cpp | 16 +++------------- TAO/tao/PortableServer/Default_Acceptor_Filter.h | 8 ++++---- 3 files changed, 9 insertions(+), 19 deletions(-) diff --git a/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp b/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp index 38e3b9a251e..7384025005b 100644 --- a/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp +++ b/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp @@ -9,11 +9,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Acceptor_Filter* TAO_Acceptor_Filter_Factory::create_object (TAO_POA_Manager& ) { - TAO_Acceptor_Filter *filter = 0; + TAO_Acceptor_Filter *filter = nullptr; ACE_NEW_RETURN (filter, TAO_Default_Acceptor_Filter (), - 0); + nullptr); return filter; } diff --git a/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp b/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp index ec9ae61a7a8..28024ce6c2b 100644 --- a/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp +++ b/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp @@ -6,10 +6,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Default_Acceptor_Filter::TAO_Default_Acceptor_Filter () -{ -} - int TAO_Default_Acceptor_Filter::fill_profile (const TAO::ObjectKey &object_key, TAO_MProfile &mprofile, @@ -18,14 +14,10 @@ TAO_Default_Acceptor_Filter::fill_profile (const TAO::ObjectKey &object_key, CORBA::Short priority) { // Go through all the acceptors. - for (TAO_Acceptor** acceptor = acceptors_begin; - acceptor != acceptors_end; - ++acceptor) + for (TAO_Acceptor** acceptor = acceptors_begin; acceptor != acceptors_end; ++acceptor) { // Ask each acceptor to make a profile. - if ((*acceptor)->create_profile (object_key, - mprofile, - priority) == -1) + if ((*acceptor)->create_profile (object_key, mprofile, priority) == -1) return -1; } @@ -37,9 +29,7 @@ TAO_Default_Acceptor_Filter::encode_endpoints (TAO_MProfile &mprofile) { // if -ORBUseSharedProfile is set, there may be multiple endpoints // per profile, even without priority. - for (CORBA::ULong i = 0; - i < mprofile.profile_count (); - ++i) + for (CORBA::ULong i = 0; i < mprofile.profile_count (); ++i) { TAO_Profile *profile = mprofile.get_profile (i); if (profile->encode_alternate_endpoints () == -1) diff --git a/TAO/tao/PortableServer/Default_Acceptor_Filter.h b/TAO/tao/PortableServer/Default_Acceptor_Filter.h index c440b985c5d..0057e403b6a 100644 --- a/TAO/tao/PortableServer/Default_Acceptor_Filter.h +++ b/TAO/tao/PortableServer/Default_Acceptor_Filter.h @@ -41,18 +41,18 @@ class TAO_PortableServer_Export TAO_Default_Acceptor_Filter : public TAO_Acceptor_Filter { public: - TAO_Default_Acceptor_Filter (); + TAO_Default_Acceptor_Filter () = default; /// Populate @a mprofile with all available endpoints. - virtual int fill_profile (const TAO::ObjectKey &object_key, + int fill_profile (const TAO::ObjectKey &object_key, TAO_MProfile &mprofile, TAO_Acceptor **acceptors_begin, TAO_Acceptor **acceptors_end, - CORBA::Short priority = TAO_INVALID_PRIORITY); + CORBA::Short priority = TAO_INVALID_PRIORITY) override; /// Encodes the endpoints in the profiles into the TAO_TAG_ENDPOINTS /// tag component of profiles. - int encode_endpoints (TAO_MProfile &mprofile); + int encode_endpoints (TAO_MProfile &mprofile) override; }; TAO_END_VERSIONED_NAMESPACE_DECL -- cgit v1.2.1 From d9b768c3239be29c3219f2fca81b39e2dc8787b1 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 13 Feb 2023 15:29:08 +0100 Subject: the_children is not available in all CORBA profiles * TAO/tao/PortableServer/Root_POA.cpp: * TAO/tao/PortableServer/Root_POA.h: * TAO/tao/RTPortableServer/RT_POA.cpp: * TAO/tao/RTPortableServer/RT_POA.h: --- TAO/tao/PortableServer/Root_POA.cpp | 4 +++- TAO/tao/PortableServer/Root_POA.h | 3 ++- TAO/tao/RTPortableServer/RT_POA.cpp | 4 ++-- TAO/tao/RTPortableServer/RT_POA.h | 4 ++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp index 049f891a4bf..f894825dd50 100644 --- a/TAO/tao/PortableServer/Root_POA.cpp +++ b/TAO/tao/PortableServer/Root_POA.cpp @@ -736,6 +736,8 @@ TAO_Root_POA::servant_to_reference (PortableServer::Servant servant) return this->servant_to_reference_i (servant); } + +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::POAList * TAO_Root_POA::the_children () { @@ -744,7 +746,7 @@ TAO_Root_POA::the_children () return this->the_children_i (); } - +#endif /* TAO_HAS_MINIMUM_POA == 0 && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */ PortableServer::Servant TAO_Root_POA::id_to_servant (const PortableServer::ObjectId &oid) diff --git a/TAO/tao/PortableServer/Root_POA.h b/TAO/tao/PortableServer/Root_POA.h index 812a4b7d00e..899c8031481 100644 --- a/TAO/tao/PortableServer/Root_POA.h +++ b/TAO/tao/PortableServer/Root_POA.h @@ -173,14 +173,15 @@ public: PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy ( PortableServer::RequestProcessingPolicyValue value); - #endif /* TAO_HAS_MINIMUM_POA == 0 && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */ char * the_name (); PortableServer::POA_ptr the_parent (); +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::POAList *the_children (); +#endif /* TAO_HAS_MINIMUM_POA == 0 && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */ PortableServer::POAManager_ptr the_POAManager (); diff --git a/TAO/tao/RTPortableServer/RT_POA.cpp b/TAO/tao/RTPortableServer/RT_POA.cpp index 93b27235ac6..87830403e45 100644 --- a/TAO/tao/RTPortableServer/RT_POA.cpp +++ b/TAO/tao/RTPortableServer/RT_POA.cpp @@ -569,11 +569,13 @@ TAO_RT_POA::the_parent () return this->TAO_Regular_POA::the_parent (); } +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::POAList * TAO_RT_POA::the_children () { return this->TAO_Regular_POA::the_children (); } +#endif /* TAO_HAS_MINIMUM_POA == 0 */ PortableServer::POAManager_ptr TAO_RT_POA::the_POAManager () @@ -581,9 +583,7 @@ TAO_RT_POA::the_POAManager () return this->TAO_Regular_POA::the_POAManager (); } - #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - PortableServer::AdapterActivator_ptr TAO_RT_POA::the_activator () { diff --git a/TAO/tao/RTPortableServer/RT_POA.h b/TAO/tao/RTPortableServer/RT_POA.h index 62420daa053..aedc17d469c 100644 --- a/TAO/tao/RTPortableServer/RT_POA.h +++ b/TAO/tao/RTPortableServer/RT_POA.h @@ -120,12 +120,13 @@ public: PortableServer::POA_ptr the_parent () override; +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::POAList *the_children () override; +#endif /* TAO_HAS_MINIMUM_POA == 0 */ PortableServer::POAManager_ptr the_POAManager () override; #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - PortableServer::AdapterActivator_ptr the_activator () override; void the_activator (PortableServer::AdapterActivator_ptr adapter_activator) override; @@ -137,7 +138,6 @@ public: PortableServer::Servant get_servant () override; void set_servant (PortableServer::Servant servant) override; - #endif /* TAO_HAS_MINIMUM_POA == 0 */ PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant) override; -- cgit v1.2.1 From 88ce4a3384ee967a8007a3575bfca9d2dde0dc7a Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 13 Feb 2023 16:23:46 +0100 Subject: Replace enum with static constexpr * TAO/tao/PortableServer/Root_POA.h: --- TAO/tao/PortableServer/Root_POA.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/TAO/tao/PortableServer/Root_POA.h b/TAO/tao/PortableServer/Root_POA.h index 899c8031481..436e6e67704 100644 --- a/TAO/tao/PortableServer/Root_POA.h +++ b/TAO/tao/PortableServer/Root_POA.h @@ -275,10 +275,7 @@ public: static CORBA::ULong name_separator_length (); - enum - { - TAO_OBJECTKEY_PREFIX_SIZE = 4 - }; + static constexpr size_t TAO_OBJECTKEY_PREFIX_SIZE = 4; static CORBA::Octet const objectkey_prefix[TAO_OBJECTKEY_PREFIX_SIZE]; -- cgit v1.2.1 From 45fa63be04357683ab473a2f993e621508ecb5f7 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 13 Feb 2023 16:29:08 +0100 Subject: Fixed warnings * TAO/tao/PortableServer/IdAssignmentPolicy.h: * TAO/tao/PortableServer/IdUniquenessPolicy.h: * TAO/tao/PortableServer/LifespanStrategyPersistent.h: * TAO/tao/PortableServer/LifespanStrategyTransient.h: * TAO/tao/PortableServer/Operation_Table_Linear_Search.h: * TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h: * TAO/tao/PortableServer/ServantRetentionStrategyRetain.h: * TAO/tao/RTPortableServer/RT_POA.h: * TAO/tao/RTPortableServer/RT_Policy_Validator.h: --- TAO/tao/PortableServer/IdAssignmentPolicy.h | 8 ++++---- TAO/tao/PortableServer/IdUniquenessPolicy.h | 8 ++++---- TAO/tao/PortableServer/LifespanStrategyPersistent.h | 2 +- TAO/tao/PortableServer/LifespanStrategyTransient.h | 2 +- TAO/tao/PortableServer/Operation_Table_Linear_Search.h | 2 +- TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h | 4 ++-- TAO/tao/PortableServer/ServantRetentionStrategyRetain.h | 2 +- TAO/tao/RTPortableServer/RT_POA.h | 2 +- TAO/tao/RTPortableServer/RT_Policy_Validator.h | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/TAO/tao/PortableServer/IdAssignmentPolicy.h b/TAO/tao/PortableServer/IdAssignmentPolicy.h index bef8f68e0b5..e7c4f4c21d0 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicy.h +++ b/TAO/tao/PortableServer/IdAssignmentPolicy.h @@ -43,13 +43,13 @@ namespace TAO public: IdAssignmentPolicy (::PortableServer::IdAssignmentPolicyValue value); - CORBA::Policy_ptr copy (); + CORBA::Policy_ptr copy () override; - void destroy (); + void destroy () override; - ::PortableServer::IdAssignmentPolicyValue value (); + ::PortableServer::IdAssignmentPolicyValue value () override; - CORBA::PolicyType policy_type (); + CORBA::PolicyType policy_type () override; /// Return the cached policy type for this policy. TAO_Cached_Policy_Type _tao_cached_type () const override; diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.h b/TAO/tao/PortableServer/IdUniquenessPolicy.h index 3cf26325ac5..8793a19f90b 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicy.h +++ b/TAO/tao/PortableServer/IdUniquenessPolicy.h @@ -43,13 +43,13 @@ namespace TAO public: IdUniquenessPolicy (::PortableServer::IdUniquenessPolicyValue value); - CORBA::Policy_ptr copy (); + CORBA::Policy_ptr copy () override; - void destroy (); + void destroy () override; - ::PortableServer::IdUniquenessPolicyValue value (); + ::PortableServer::IdUniquenessPolicyValue value () override; - CORBA::PolicyType policy_type (); + CORBA::PolicyType policy_type () override; /// Return the cached policy type for this policy. TAO_Cached_Policy_Type _tao_cached_type () const override; diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistent.h b/TAO/tao/PortableServer/LifespanStrategyPersistent.h index 9b964c2b184..5de7c9cb52c 100644 --- a/TAO/tao/PortableServer/LifespanStrategyPersistent.h +++ b/TAO/tao/PortableServer/LifespanStrategyPersistent.h @@ -44,7 +44,7 @@ namespace TAO CORBA::Boolean is_persistent () const override; - CORBA::ULong key_length () const; + CORBA::ULong key_length () const override; void create_key (CORBA::Octet *buffer, CORBA::ULong& starting_at) override; diff --git a/TAO/tao/PortableServer/LifespanStrategyTransient.h b/TAO/tao/PortableServer/LifespanStrategyTransient.h index 5a3c7d988d5..58092432668 100644 --- a/TAO/tao/PortableServer/LifespanStrategyTransient.h +++ b/TAO/tao/PortableServer/LifespanStrategyTransient.h @@ -40,7 +40,7 @@ namespace TAO CORBA::Boolean is_persistent () const override; - CORBA::ULong key_length () const; + CORBA::ULong key_length () const override; void create_key (CORBA::Octet *buffer, CORBA::ULong& starting_at) override; diff --git a/TAO/tao/PortableServer/Operation_Table_Linear_Search.h b/TAO/tao/PortableServer/Operation_Table_Linear_Search.h index 75dd2dc7f53..c69ab4a5542 100644 --- a/TAO/tao/PortableServer/Operation_Table_Linear_Search.h +++ b/TAO/tao/PortableServer/Operation_Table_Linear_Search.h @@ -47,7 +47,7 @@ public: const unsigned int length = 0) override; int bind (const char *opname, - const TAO::Operation_Skeletons skelptr); + const TAO::Operation_Skeletons skelptr) override; private: // = Method that should defined by the subclasses. GPERF program diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h index 3365ec714fd..0e778aeb49d 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h @@ -39,7 +39,7 @@ namespace TAO void strategy_cleanup() override; - CORBA::ULong waiting_servant_deactivation () const; + CORBA::ULong waiting_servant_deactivation () const override; PortableServer::ObjectId * activate_object (PortableServer::Servant servant, @@ -68,7 +68,7 @@ namespace TAO CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &id, - bool indirect); + bool indirect) override; TAO_Servant_Location servant_present ( const PortableServer::ObjectId &system_id, diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h index 22eefd38cd1..98d0c1db5db 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h @@ -120,7 +120,7 @@ namespace TAO int unbind_using_user_id ( const PortableServer::ObjectId &user_id) override; - TAO_Active_Object_Map * get_active_object_map() const; + TAO_Active_Object_Map * get_active_object_map() const override; private: std::unique_ptr active_object_map_; diff --git a/TAO/tao/RTPortableServer/RT_POA.h b/TAO/tao/RTPortableServer/RT_POA.h index aedc17d469c..206c1518a42 100644 --- a/TAO/tao/RTPortableServer/RT_POA.h +++ b/TAO/tao/RTPortableServer/RT_POA.h @@ -185,7 +185,7 @@ public: ~TAO_RT_POA () override = default; - void *thread_pool () const; + void *thread_pool () const override; protected: /// Template method for creating new POA's of this type. diff --git a/TAO/tao/RTPortableServer/RT_Policy_Validator.h b/TAO/tao/RTPortableServer/RT_Policy_Validator.h index 2fcf68be954..afab3f0f46e 100644 --- a/TAO/tao/RTPortableServer/RT_Policy_Validator.h +++ b/TAO/tao/RTPortableServer/RT_Policy_Validator.h @@ -60,10 +60,10 @@ protected: * are consistent and legal. Throw an appropriate exception * if that is not the case. */ - void validate_impl (TAO_Policy_Set &policies); + void validate_impl (TAO_Policy_Set &policies) override; /// Add/merge policies. - void merge_policies_impl (TAO_Policy_Set &policies); + void merge_policies_impl (TAO_Policy_Set &policies) override; /** * Return whether the specified policy type is legal for the -- cgit v1.2.1 From 80ef4188441e6a0b786e48659af9e39ecd4b9735 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 13 Feb 2023 16:38:30 +0100 Subject: Use default destructor * TAO/tao/Argument.cpp: * TAO/tao/Argument.h: * TAO/tao/Base_Transport_Property.cpp: * TAO/tao/Base_Transport_Property.h: --- TAO/tao/Argument.cpp | 4 ---- TAO/tao/Argument.h | 2 +- TAO/tao/Base_Transport_Property.cpp | 4 ---- TAO/tao/Base_Transport_Property.h | 2 +- 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/TAO/tao/Argument.cpp b/TAO/tao/Argument.cpp index fab7b1d7514..dee22fca0f7 100644 --- a/TAO/tao/Argument.cpp +++ b/TAO/tao/Argument.cpp @@ -3,10 +3,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO::Argument::~Argument () -{ -} - CORBA::Boolean TAO::Argument::marshal (TAO_OutputCDR &) { diff --git a/TAO/tao/Argument.h b/TAO/tao/Argument.h index 39740bb5230..cc2e35bb0de 100644 --- a/TAO/tao/Argument.h +++ b/TAO/tao/Argument.h @@ -50,7 +50,7 @@ namespace TAO { public: /// Destructor. - virtual ~Argument (); + virtual ~Argument () = default; /// Marshal the argument into the given CDR output stream. /** diff --git a/TAO/tao/Base_Transport_Property.cpp b/TAO/tao/Base_Transport_Property.cpp index 17a83e1a618..dd0eccfab29 100644 --- a/TAO/tao/Base_Transport_Property.cpp +++ b/TAO/tao/Base_Transport_Property.cpp @@ -7,10 +7,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Base_Transport_Property::~TAO_Base_Transport_Property () -{ -} - TAO_Transport_Descriptor_Interface * TAO_Base_Transport_Property::duplicate () { diff --git a/TAO/tao/Base_Transport_Property.h b/TAO/tao/Base_Transport_Property.h index 54836a0817a..7f6a33180ae 100644 --- a/TAO/tao/Base_Transport_Property.h +++ b/TAO/tao/Base_Transport_Property.h @@ -43,7 +43,7 @@ public: CORBA::Boolean flag = false); /// Destructor - virtual ~TAO_Base_Transport_Property (); + virtual ~TAO_Base_Transport_Property () = default; /// The copy constructor. TAO_Base_Transport_Property (const TAO_Base_Transport_Property &rhs); -- cgit v1.2.1 From d2b7bf891f0b11840b5528b89cac105daef04f33 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 13 Feb 2023 16:51:14 +0100 Subject: Revert default * TAO/tao/Argument.cpp: * TAO/tao/Argument.h: --- TAO/tao/Argument.cpp | 4 ++++ TAO/tao/Argument.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/TAO/tao/Argument.cpp b/TAO/tao/Argument.cpp index dee22fca0f7..fab7b1d7514 100644 --- a/TAO/tao/Argument.cpp +++ b/TAO/tao/Argument.cpp @@ -3,6 +3,10 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL +TAO::Argument::~Argument () +{ +} + CORBA::Boolean TAO::Argument::marshal (TAO_OutputCDR &) { diff --git a/TAO/tao/Argument.h b/TAO/tao/Argument.h index cc2e35bb0de..39740bb5230 100644 --- a/TAO/tao/Argument.h +++ b/TAO/tao/Argument.h @@ -50,7 +50,7 @@ namespace TAO { public: /// Destructor. - virtual ~Argument () = default; + virtual ~Argument (); /// Marshal the argument into the given CDR output stream. /** -- cgit v1.2.1 From 94392eaddf51af04621f46337b392c688171434f Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 13 Feb 2023 16:51:27 +0100 Subject: Use constexpr * TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp: * TAO/tao/Codeset/UTF16_BOM_Translator.cpp: * TAO/tao/GIOP_Message_Generator_Parser_12.cpp: --- TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp | 2 +- TAO/tao/Codeset/UTF16_BOM_Translator.cpp | 9 ++++----- TAO/tao/GIOP_Message_Generator_Parser_12.cpp | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp index 6dfda150d7e..30d76194aa1 100644 --- a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp +++ b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp @@ -338,7 +338,7 @@ TAO::CSD::FW_Server_Request_Wrapper::clone (TAO_Operation_Details const *& from, } else { - static const size_t mb_size = 2048; + static constexpr size_t mb_size = 2048; ACE_NEW_RETURN (cdr, TAO_InputCDR (mb_size), false); diff --git a/TAO/tao/Codeset/UTF16_BOM_Translator.cpp b/TAO/tao/Codeset/UTF16_BOM_Translator.cpp index 4f47a615460..4df509712c8 100644 --- a/TAO/tao/Codeset/UTF16_BOM_Translator.cpp +++ b/TAO/tao/Codeset/UTF16_BOM_Translator.cpp @@ -19,11 +19,10 @@ // **************************************************************** typedef ACE_CDR::UShort ACE_UTF16_T; -static const size_t ACE_UTF16_CODEPOINT_SIZE = sizeof (ACE_UTF16_T); -static const ACE_CDR::ULong ACE_UL_UTF16_CODEPOINT_SIZE = - static_cast(ACE_UTF16_CODEPOINT_SIZE); -static const unsigned short ACE_UNICODE_BOM_CORRECT = 0xFEFFU; -static const unsigned short ACE_UNICODE_BOM_SWAPPED = 0xFFFEU; +static constexpr size_t ACE_UTF16_CODEPOINT_SIZE = sizeof (ACE_UTF16_T); +static constexpr ACE_CDR::ULong ACE_UL_UTF16_CODEPOINT_SIZE = static_cast(ACE_UTF16_CODEPOINT_SIZE); +static constexpr unsigned short ACE_UNICODE_BOM_CORRECT = 0xFEFFU; +static constexpr unsigned short ACE_UNICODE_BOM_SWAPPED = 0xFFFEU; TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp index 7cbadbbc658..0dfc12ae0f4 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp @@ -16,7 +16,7 @@ // This is used by GIOP1.2. This is to align the message body on a // 8-octet boundary. This is declared static so that it is in file // scope. -static const size_t TAO_GIOP_MESSAGE_ALIGN_PTR = 8; +static constexpr size_t TAO_GIOP_MESSAGE_ALIGN_PTR = 8; TAO_BEGIN_VERSIONED_NAMESPACE_DECL -- cgit v1.2.1 From 90371aba592ff8153762036e2b0d5bd723af4a7d Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 13 Feb 2023 17:04:25 +0100 Subject: Generate some parts as constexpr * ACE/apps/gperf/src/Key_List.cpp: --- ACE/apps/gperf/src/Key_List.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ACE/apps/gperf/src/Key_List.cpp b/ACE/apps/gperf/src/Key_List.cpp index 1d02a425acb..edfc738a947 100644 --- a/ACE/apps/gperf/src/Key_List.cpp +++ b/ACE/apps/gperf/src/Key_List.cpp @@ -501,7 +501,6 @@ Key_List::reorder () // Outputs the maximum and minimum hash values. Since the list is // already sorted by hash value all we need to do is find the final // item! - void Key_List::output_min_max () { @@ -817,7 +816,7 @@ Key_List::output_keyword_table () int pointer_and_type_enabled = option[POINTER] && option[TYPE]; ACE_OS::printf ("%sstatic %s%swordlist[] =\n%s%s{\n", indent, - option[CONSTANT] || pointer_and_type_enabled == 0 ? "const " : "", + option[CONSTANT] || pointer_and_type_enabled == 0 ? "constexpr " : "", struct_tag, indent, indent); @@ -1145,7 +1144,7 @@ Key_List::output_hash_function () // Generate the asso_values table. ACE_OS::printf (" static %sunsigned %s asso_values[] =\n {", - option[CONSTANT] ? "const " : "", + option[CONSTANT] ? "constexpr " : "", max_hash_value < ((int) UCHAR_MAX) ? "char" : (max_hash_value < ((int) USHRT_MAX) ? "short" : "int")); #if ACE_STANDARD_CHARACTER_SET_SIZE == ACE_EBCDIC_SIZE @@ -1443,7 +1442,7 @@ Key_List::output_lookup_array () const char *indent = option[GLOBAL] ? "" : " "; - ACE_OS::printf ("%sstatic %ssigned %s lookup[] =\n%s%s{\n%s", indent, option[CONSTANT] ? "const " : "", + ACE_OS::printf ("%sstatic %ssigned %s lookup[] =\n%s%s{\n%s", indent, option[CONSTANT] ? "constexpr " : "", max <= SCHAR_MAX ? "char" : (max <= SHRT_MAX ? "short" : "int"), indent, indent, option[DEBUGGING] ? "" : " "); -- cgit v1.2.1 From 5df6c5248e1c1be3aeaefa10ff9eb9be593ec2fd Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 13 Feb 2023 17:04:40 +0100 Subject: Reduced usage of static as we do in generated code * TAO/tao/PortableServer/Servant_Base.cpp: --- TAO/tao/PortableServer/Servant_Base.cpp | 110 ++++++++------------------------ 1 file changed, 27 insertions(+), 83 deletions(-) diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp index 54d5cff2d9d..8809dfd031a 100644 --- a/TAO/tao/PortableServer/Servant_Base.cpp +++ b/TAO/tao/PortableServer/Servant_Base.cpp @@ -72,7 +72,7 @@ TAO_ServantBase::TAO_ServantBase (const TAO_ServantBase &rhs) TAO_ServantBase & TAO_ServantBase::operator= (const TAO_ServantBase &rhs) { - if (this != &rhs) + if (this != std::addressof(rhs)) { this->optable_ = rhs.optable_; } @@ -97,11 +97,6 @@ TAO_ServantBase::_is_a_skel (TAO_ServerRequest & server_request, TAO::Portable_Server::Servant_Upcall* TAO_INTERCEPTOR(servant_upcall), TAO_ServantBase *servant) { -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval; TAO::SArg_Traits< char *>::in_arg_val _tao_repository_id; @@ -111,8 +106,6 @@ TAO_ServantBase::_is_a_skel (TAO_ServerRequest & server_request, &_tao_repository_id }; - static size_t const nargs = 2; - _is_a_Upcall_Command command ( servant, args); @@ -120,12 +113,12 @@ TAO_ServantBase::_is_a_skel (TAO_ServerRequest & server_request, TAO::Upcall_Wrapper upcall_wrapper; upcall_wrapper.upcall (server_request , args - , nargs + , 2 , command #if TAO_HAS_INTERCEPTORS == 1 , servant_upcall - , exceptions - , nexceptions + , nullptr + , 0 #endif /* TAO_HAS_INTERCEPTORS == 1 */ ); } @@ -135,11 +128,6 @@ TAO_ServantBase::_is_a_thru_poa_skel (TAO_ServerRequest & server_request, TAO::Portable_Server::Servant_Upcall* TAO_INTERCEPTOR (servant_upcall), TAO_ServantBase *servant) { -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval; TAO::SArg_Traits< char *>::in_arg_val _tao_repository_id; @@ -149,8 +137,6 @@ TAO_ServantBase::_is_a_thru_poa_skel (TAO_ServerRequest & server_request, &_tao_repository_id }; - static size_t const nargs = 2; - _is_a_thru_poa_Upcall_Command command ( servant, server_request.operation_details (), @@ -159,12 +145,12 @@ TAO_ServantBase::_is_a_thru_poa_skel (TAO_ServerRequest & server_request, TAO::Upcall_Wrapper upcall_wrapper; upcall_wrapper.upcall (server_request , args - , nargs + , 2 , command #if TAO_HAS_INTERCEPTORS == 1 , servant_upcall - , exceptions - , nexceptions + , nullptr + , 0 #endif /* TAO_HAS_INTERCEPTORS == 1 */ ); } @@ -176,11 +162,6 @@ TAO_ServantBase::_non_existent_skel (TAO_ServerRequest & server_request, TAO::Portable_Server::Servant_Upcall* TAO_INTERCEPTOR (servant_upcall), TAO_ServantBase *servant) { -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval; TAO::Argument * const args[] = @@ -188,8 +169,6 @@ TAO_ServantBase::_non_existent_skel (TAO_ServerRequest & server_request, &retval }; - static size_t const nargs = 1; - _non_existent_Upcall_Command command ( servant, args); @@ -197,12 +176,12 @@ TAO_ServantBase::_non_existent_skel (TAO_ServerRequest & server_request, TAO::Upcall_Wrapper upcall_wrapper; upcall_wrapper.upcall (server_request , args - , nargs + , 1 , command #if TAO_HAS_INTERCEPTORS == 1 , servant_upcall - , exceptions - , nexceptions + , nullptr + , 0 #endif /* TAO_HAS_INTERCEPTORS == 1 */ ); } @@ -211,11 +190,6 @@ void TAO_ServantBase::_non_existent_thru_poa_skel (TAO_ServerRequest & server_re TAO::Portable_Server::Servant_Upcall* TAO_INTERCEPTOR (servant_upcall), TAO_ServantBase *servant) { -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval; TAO::Argument * const args[] = @@ -223,8 +197,6 @@ void TAO_ServantBase::_non_existent_thru_poa_skel (TAO_ServerRequest & server_re &retval }; - static size_t const nargs = 1; - _non_existent_thru_poa_Upcall_Command command ( servant, server_request.operation_details (), @@ -233,12 +205,12 @@ void TAO_ServantBase::_non_existent_thru_poa_skel (TAO_ServerRequest & server_re TAO::Upcall_Wrapper upcall_wrapper; upcall_wrapper.upcall (server_request , args - , nargs + , 1 , command #if TAO_HAS_INTERCEPTORS == 1 , servant_upcall - , exceptions - , nexceptions + , nullptr + , 0 #endif /* TAO_HAS_INTERCEPTORS == 1 */ ); } @@ -279,11 +251,6 @@ TAO_ServantBase::_component_skel (TAO_ServerRequest & server_request, TAO::Portable_Server::Servant_Upcall* TAO_INTERCEPTOR (servant_upcall), TAO_ServantBase *servant) { -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - TAO::SArg_Traits< ::CORBA::Object>::ret_val retval; TAO::Argument * const args[] = @@ -291,8 +258,6 @@ TAO_ServantBase::_component_skel (TAO_ServerRequest & server_request, &retval }; - static size_t const nargs = 1; - _get_component_Upcall_Command command ( servant, args); @@ -300,12 +265,12 @@ TAO_ServantBase::_component_skel (TAO_ServerRequest & server_request, TAO::Upcall_Wrapper upcall_wrapper; upcall_wrapper.upcall (server_request , args - , nargs + , 1 , command #if TAO_HAS_INTERCEPTORS == 1 , servant_upcall - , exceptions - , nexceptions + , nullptr + , 0 #endif /* TAO_HAS_INTERCEPTORS == 1 */ ); } @@ -315,11 +280,6 @@ TAO_ServantBase::_component_thru_poa_skel (TAO_ServerRequest & server_request, TAO::Portable_Server::Servant_Upcall* TAO_INTERCEPTOR (servant_upcall), TAO_ServantBase *servant) { -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - TAO::SArg_Traits< ::CORBA::Object>::ret_val retval; TAO::Argument * const args[] = @@ -327,8 +287,6 @@ TAO_ServantBase::_component_thru_poa_skel (TAO_ServerRequest & server_request, &retval }; - static size_t const nargs = 1; - _get_component_thru_poa_Upcall_Command command ( servant, server_request.operation_details (), @@ -337,12 +295,12 @@ TAO_ServantBase::_component_thru_poa_skel (TAO_ServerRequest & server_request, TAO::Upcall_Wrapper upcall_wrapper; upcall_wrapper.upcall (server_request , args - , nargs + , 1 , command #if TAO_HAS_INTERCEPTORS == 1 , servant_upcall - , exceptions - , nexceptions + , nullptr + , 0 #endif /* TAO_HAS_INTERCEPTORS == 1 */ ); } @@ -355,11 +313,6 @@ TAO_ServantBase::_repository_id_skel (TAO_ServerRequest & server_request, TAO::Portable_Server::Servant_Upcall* TAO_INTERCEPTOR (servant_upcall), TAO_ServantBase *servant) { -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - TAO::SArg_Traits< char *>::ret_val retval; TAO::Argument * const args[] = @@ -367,8 +320,6 @@ TAO_ServantBase::_repository_id_skel (TAO_ServerRequest & server_request, &retval }; - static size_t const nargs = 1; - _repository_id_Upcall_Command command ( servant, args); @@ -376,12 +327,12 @@ TAO_ServantBase::_repository_id_skel (TAO_ServerRequest & server_request, TAO::Upcall_Wrapper upcall_wrapper; upcall_wrapper.upcall (server_request , args - , nargs + , 1 , command #if TAO_HAS_INTERCEPTORS == 1 , servant_upcall - , exceptions - , nexceptions + , nullptr + , 0 #endif /* TAO_HAS_INTERCEPTORS == 1 */ ); } @@ -391,11 +342,6 @@ TAO_ServantBase::_repository_id_thru_poa_skel (TAO_ServerRequest & server_reques TAO::Portable_Server::Servant_Upcall* TAO_INTERCEPTOR (servant_upcall), TAO_ServantBase *servant) { -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - TAO::SArg_Traits< char *>::ret_val retval; TAO::Argument * const args[] = @@ -403,8 +349,6 @@ TAO_ServantBase::_repository_id_thru_poa_skel (TAO_ServerRequest & server_reques &retval }; - static size_t const nargs = 1; - _repository_id_thru_poa_Upcall_Command command ( servant, server_request.operation_details (), @@ -413,12 +357,12 @@ TAO_ServantBase::_repository_id_thru_poa_skel (TAO_ServerRequest & server_reques TAO::Upcall_Wrapper upcall_wrapper; upcall_wrapper.upcall (server_request , args - , nargs + , 1 , command #if TAO_HAS_INTERCEPTORS == 1 , servant_upcall - , exceptions - , nexceptions + , nullptr + , 0 #endif /* TAO_HAS_INTERCEPTORS == 1 */ ); } @@ -494,13 +438,13 @@ TAO_ServantBase::_find (const char *opname, TAO_Stub * TAO_ServantBase::_create_stub () { - TAO_Stub *stub = 0; + TAO_Stub *stub = nullptr; TAO::Portable_Server::POA_Current_Impl *poa_current_impl = static_cast (TAO_TSS_Resources::instance ()->poa_current_impl_); - CORBA::ORB_ptr servant_orb = 0; + CORBA::ORB_ptr servant_orb = nullptr; if (poa_current_impl != 0 && this == poa_current_impl->servant ()) -- cgit v1.2.1 From d19030946af88f57a4b2b29af9228cbbf0386a71 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 13 Feb 2023 18:08:58 +0100 Subject: Revert one constexpr change * ACE/apps/gperf/src/Key_List.cpp: --- ACE/apps/gperf/src/Key_List.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ACE/apps/gperf/src/Key_List.cpp b/ACE/apps/gperf/src/Key_List.cpp index edfc738a947..cdb6ee90851 100644 --- a/ACE/apps/gperf/src/Key_List.cpp +++ b/ACE/apps/gperf/src/Key_List.cpp @@ -816,7 +816,7 @@ Key_List::output_keyword_table () int pointer_and_type_enabled = option[POINTER] && option[TYPE]; ACE_OS::printf ("%sstatic %s%swordlist[] =\n%s%s{\n", indent, - option[CONSTANT] || pointer_and_type_enabled == 0 ? "constexpr " : "", + option[CONSTANT] || pointer_and_type_enabled == 0 ? "const " : "", struct_tag, indent, indent); -- cgit v1.2.1 From 7a7f6db56d3a136c765558ace03eda3845d9f3a3 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 20 Feb 2023 15:44:04 +0100 Subject: ACE/TAO now require C++14 or newer * ACE/NEWS: * ACE/ace/Global_Macros.h: * ACE/ace/config-win32-msvc-141.h: * ACE/examples/Logger/Acceptor-server/server_loggerd.cpp: * ACE/include/makeinclude/platform_linux_clang.GNU: * ACE/include/makeinclude/platform_macosx_common.GNU: --- ACE/NEWS | 2 ++ ACE/ace/Global_Macros.h | 4 ++-- ACE/ace/config-win32-msvc-141.h | 3 +++ ACE/examples/Logger/Acceptor-server/server_loggerd.cpp | 1 - ACE/include/makeinclude/platform_linux_clang.GNU | 4 ++++ ACE/include/makeinclude/platform_macosx_common.GNU | 2 +- 6 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ACE/NEWS b/ACE/NEWS index 991e25e40b5..ee0460be2b2 100644 --- a/ACE/NEWS +++ b/ACE/NEWS @@ -4,6 +4,8 @@ USER VISIBLE CHANGES BETWEEN ACE-7.0.11 and ACE-7.1.0 . Removed support for Windows CE, OpenVMS, HPUX, AIX, RTEMS, Pharlap, and Solaris +. ACE/TAO now require C++14 or newer + USER VISIBLE CHANGES BETWEEN ACE-7.0.10 and ACE-7.0.11 ====================================================== diff --git a/ACE/ace/Global_Macros.h b/ACE/ace/Global_Macros.h index bc9b20a4962..e43b1002dd4 100644 --- a/ACE/ace/Global_Macros.h +++ b/ACE/ace/Global_Macros.h @@ -57,8 +57,8 @@ # define ACE_SET_BITS(WORD, BITS) (WORD |= (BITS)) # define ACE_CLR_BITS(WORD, BITS) (WORD &= ~(BITS)) -#if !defined (ACE_HAS_CPP11) -# error ACE/TAO require C++11 compliance, please upgrade your compiler and/or fix the platform configuration for your environment +#if !defined (ACE_HAS_CPP14) +# error ACE/TAO require C++14 compliance, please upgrade your compiler and/or fix the platform configuration for your environment #endif /* !ACE_HAS_CPP11 */ #define ACE_UNIMPLEMENTED_FUNC(f) f = delete; diff --git a/ACE/ace/config-win32-msvc-141.h b/ACE/ace/config-win32-msvc-141.h index c6376395d13..8c3c201631b 100644 --- a/ACE/ace/config-win32-msvc-141.h +++ b/ACE/ace/config-win32-msvc-141.h @@ -23,6 +23,9 @@ # define ACE_WIN32_VC141 #endif +// Visual Studio 2017 has adequate C++14 support +#define ACE_HAS_CPP14 + #include "ace/config-win32-msvc-14.h" #if _MSVC_LANG >= 201402L diff --git a/ACE/examples/Logger/Acceptor-server/server_loggerd.cpp b/ACE/examples/Logger/Acceptor-server/server_loggerd.cpp index ba53e2b3af6..dc3a2af3b01 100644 --- a/ACE/examples/Logger/Acceptor-server/server_loggerd.cpp +++ b/ACE/examples/Logger/Acceptor-server/server_loggerd.cpp @@ -260,7 +260,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) return 0; } -//typedef ACE_Test_and_Set ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, ACE_Reactor, ACE_Null_Mutex); ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, Options, ACE_Null_Mutex); #define ACE_Test_and_Set_type \ diff --git a/ACE/include/makeinclude/platform_linux_clang.GNU b/ACE/include/makeinclude/platform_linux_clang.GNU index 2cfc0accbec..1bc22c06a02 100644 --- a/ACE/include/makeinclude/platform_linux_clang.GNU +++ b/ACE/include/makeinclude/platform_linux_clang.GNU @@ -45,6 +45,10 @@ ifeq ($(c++11),1) CCFLAGS += -std=c++11 endif +ifeq ($(c++14),1) + CCFLAGS += -std=c++14 +endif + ifeq ($(no_deprecated),1) CCFLAGS += -Wno-deprecated-declarations endif diff --git a/ACE/include/makeinclude/platform_macosx_common.GNU b/ACE/include/makeinclude/platform_macosx_common.GNU index 342883b2855..315521a7f8f 100644 --- a/ACE/include/makeinclude/platform_macosx_common.GNU +++ b/ACE/include/makeinclude/platform_macosx_common.GNU @@ -42,7 +42,7 @@ SOBUILD = -o $(VSHDIR)$*.dylib $< ifeq ($(findstring g++,$(CXX)),)# include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU else - c++11 ?= 1 + c++14 ?= 1 include $(ACE_ROOT)/include/makeinclude/platform_clang_common.GNU endif -- cgit v1.2.1 From 748e48be4bbdc75d665a042fa7f5911d89b944a5 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 20 Feb 2023 15:45:26 +0100 Subject: Removed gcc 4.8, doesn't support C++14 * .github/workflows/linux.yml: --- .github/workflows/linux.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 310922433cd..50a5f38d2ff 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -24,11 +24,6 @@ jobs: fail-fast: false matrix: include: - - CC: gcc-4.8 - CXX: g++-4.8 - PackageDeps: g++-4.8 - platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU - os: ubuntu-18.04 - CC: gcc-6 CXX: g++-6 PackageDeps: g++-6 -- cgit v1.2.1 From 46e095cc536cb302af7bef33c79f3c93977df343 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 20 Feb 2023 15:48:34 +0100 Subject: Removed Visual Studio 2015 support, lacks C++14 * ACE/ace/config-win32-msvc-14.h: Deleted. * ACE/ace/config-win32-msvc-141.h: * ACE/ace/config-win32-msvc.h: --- ACE/ace/config-win32-msvc-14.h | 131 ---------------------------------------- ACE/ace/config-win32-msvc-141.h | 105 +++++++++++++++++++++++++++++++- ACE/ace/config-win32-msvc.h | 2 - 3 files changed, 102 insertions(+), 136 deletions(-) delete mode 100644 ACE/ace/config-win32-msvc-14.h diff --git a/ACE/ace/config-win32-msvc-14.h b/ACE/ace/config-win32-msvc-14.h deleted file mode 100644 index 18fea9a9a5e..00000000000 --- a/ACE/ace/config-win32-msvc-14.h +++ /dev/null @@ -1,131 +0,0 @@ -/* -*- C++ -*- */ -//============================================================================= -/** - * @file config-win32-msvc-14.h - * - * @brief Microsoft Visual C++ 14.0 configuration file. - * - * This file is the ACE configuration file for Microsoft Visual C++ version 2015. - * - * @note Do not include this file directly, include config-win32.h instead. - */ -//============================================================================= - -#ifndef ACE_CONFIG_WIN32_MSVC_14_H -#define ACE_CONFIG_WIN32_MSVC_14_H -#include /**/ "ace/pre.h" - -#ifndef ACE_CONFIG_WIN32_H -#error Use config-win32.h in config.h instead of this header -#endif /* ACE_CONFIG_WIN32_H */ - -#ifndef ACE_WIN32_VC14 -# define ACE_WIN32_VC14 -#endif - -// Windows' timeval is non-conformant (defined in terms of long instead of -// time_t) and VC8 changed time_t to a 64-bit value even when compiling a -// 32-bit application. Therefore, ace/Time_Value needs to rearrange a few -// things for this compiler. See Time_Value.h for complete details. -#if !defined (_USE_32BIT_TIME_T) -# define ACE_HAS_TIME_T_LONG_MISMATCH -#endif - -#define ACE_HAS_ITOA - -#define ACE_ITOA_EQUIVALENT ::_itoa -#define ACE_STRCASECMP_EQUIVALENT ::_stricmp -#define ACE_STRNCASECMP_EQUIVALENT ::_strnicmp -#define ACE_WCSDUP_EQUIVALENT ::_wcsdup -#define ACE_FILENO_EQUIVALENT(X) (_get_osfhandle (::_fileno (X))) - -#define ACE_HAS_SIG_ATOMIC_T - -#define ACE_LACKS_STRPTIME - -#define ACE_HAS_INTRIN_H -#define ACE_HAS_INTRINSIC_INTERLOCKED - -#define ACE_HAS_INTRINSIC_BYTESWAP - -#define ACE_LACKS_STRRECVFD - -// Platform provides ACE_TLI function prototypes. -// For Win32, this is not really true, but saves a lot of hassle! -#define ACE_HAS_TLI_PROTOTYPES - -// Platform support linebuffered streaming is broken -#define ACE_LACKS_LINEBUFFERED_STREAMBUF - -// ace/iostream.h does not work with the standard cpp library (yet). -#if !defined (ACE_USES_OLD_IOSTREAMS) -# define ACE_LACKS_ACE_IOSTREAM -#endif /* ! ACE_USES_OLD_IOSTREAMS */ - -// There are too many instances of this warning to fix it right now. -// Maybe in the future. - -// Disable warning of using Microsoft Extension. -#pragma warning(disable:4231) - -// 'class1' : inherits 'class2::member' via dominance -#pragma warning(disable:4250) - -#if !defined (ACE_HAS_TR24731_2005_CRT) -# define ACE_HAS_TR24731_2005_CRT -#endif - -// A template can not be exported. Only an instantiation may be exported. -#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT - -// Windows Vista and Windows Server 2008 and newer do have native condition -// variables, but this is commented out because the support in ACE hasn't -// been completed -// #if defined (_WIN32_WINNT) && (_WIN32_WINNT >= 0x0600) -// # define ACE_HAS_WTHREADS_CONDITION_VARIABLE -// # undef ACE_LACKS_COND_T -// #endif - -#define ACE_HAS_POSIX_TIME 1 -#define ACE_LACKS_TIMESPEC_T 1 - -// According to MS the Visual Studio 2015 C-runtime has a -// C99 compliant vsnprintf/vsnwprintf, this is a change compared to -// previous versions -#define ACE_HAS_C99_VSNPRINTF -#define ACE_HAS_C99_VSNWPRINTF - -// Visual Studio 2015 has 3 parameter wcstok -#define ACE_HAS_3_PARAM_WCSTOK - -// Visual Studio 2015 has adequate C++11 support -#define ACE_HAS_CPP11 - -#define ACE_PUTENV_EQUIVALENT ::_putenv -#define ACE_TEMPNAM_EQUIVALENT ::_tempnam -#define ACE_STRDUP_EQUIVALENT ::_strdup -#define ACE_MKDIR_EQUIVALENT ::_mkdir -#define ACE_ACCESS_EQUIVALENT ::_access -#define ACE_CHDIR_EQUIVALENT ::_chdir -#define ACE_RMDIR_EQUIVALENT ::_rmdir -#define ACE_GETCWD_EQUIVALENT ::_getcwd -#define ACE_SWAB_EQUIVALENT ::_swab -#define ACE_UNLINK_EQUIVALENT ::_unlink - -#define ACE_HAS_STRNLEN -#define ACE_HAS_WCSNLEN - -#define ACE_LACKS_STRUCT_DIR -#define ACE_LACKS_OPENDIR -#define ACE_LACKS_CLOSEDIR -#define ACE_LACKS_READDIR - -#define ACE_LACKS_MODE_T -#define ACE_LACKS_PID_T - -#define ACE_LACKS_NLINK_T -#define ACE_LACKS_UID_T -#define ACE_LACKS_GID_T - -#include /**/ "ace/post.h" -#endif /* ACE_CONFIG_WIN32_MSVC_14_H */ diff --git a/ACE/ace/config-win32-msvc-141.h b/ACE/ace/config-win32-msvc-141.h index 8c3c201631b..e08e69ae736 100644 --- a/ACE/ace/config-win32-msvc-141.h +++ b/ACE/ace/config-win32-msvc-141.h @@ -23,10 +23,109 @@ # define ACE_WIN32_VC141 #endif -// Visual Studio 2017 has adequate C++14 support -#define ACE_HAS_CPP14 +// Windows' timeval is non-conformant (defined in terms of long instead of +// time_t) and VC8 changed time_t to a 64-bit value even when compiling a +// 32-bit application. Therefore, ace/Time_Value needs to rearrange a few +// things for this compiler. See Time_Value.h for complete details. +#if !defined (_USE_32BIT_TIME_T) +# define ACE_HAS_TIME_T_LONG_MISMATCH +#endif + +#define ACE_HAS_ITOA + +#define ACE_ITOA_EQUIVALENT ::_itoa +#define ACE_STRCASECMP_EQUIVALENT ::_stricmp +#define ACE_STRNCASECMP_EQUIVALENT ::_strnicmp +#define ACE_WCSDUP_EQUIVALENT ::_wcsdup +#define ACE_FILENO_EQUIVALENT(X) (_get_osfhandle (::_fileno (X))) + +#define ACE_HAS_SIG_ATOMIC_T + +#define ACE_LACKS_STRPTIME + +#define ACE_HAS_INTRIN_H +#define ACE_HAS_INTRINSIC_INTERLOCKED + +#define ACE_HAS_INTRINSIC_BYTESWAP + +#define ACE_LACKS_STRRECVFD + +// Platform provides ACE_TLI function prototypes. +// For Win32, this is not really true, but saves a lot of hassle! +#define ACE_HAS_TLI_PROTOTYPES + +// Platform support linebuffered streaming is broken +#define ACE_LACKS_LINEBUFFERED_STREAMBUF + +// ace/iostream.h does not work with the standard cpp library (yet). +#if !defined (ACE_USES_OLD_IOSTREAMS) +# define ACE_LACKS_ACE_IOSTREAM +#endif /* ! ACE_USES_OLD_IOSTREAMS */ + +// There are too many instances of this warning to fix it right now. +// Maybe in the future. + +// Disable warning of using Microsoft Extension. +#pragma warning(disable:4231) + +// 'class1' : inherits 'class2::member' via dominance +#pragma warning(disable:4250) + +#if !defined (ACE_HAS_TR24731_2005_CRT) +# define ACE_HAS_TR24731_2005_CRT +#endif + +// A template can not be exported. Only an instantiation may be exported. +#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT + +// Windows Vista and Windows Server 2008 and newer do have native condition +// variables, but this is commented out because the support in ACE hasn't +// been completed +// #if defined (_WIN32_WINNT) && (_WIN32_WINNT >= 0x0600) +// # define ACE_HAS_WTHREADS_CONDITION_VARIABLE +// # undef ACE_LACKS_COND_T +// #endif + +#define ACE_HAS_POSIX_TIME 1 +#define ACE_LACKS_TIMESPEC_T 1 + +// According to MS the Visual Studio 2015 C-runtime has a +// C99 compliant vsnprintf/vsnwprintf, this is a change compared to +// previous versions +#define ACE_HAS_C99_VSNPRINTF +#define ACE_HAS_C99_VSNWPRINTF + +// Visual Studio 2015 has 3 parameter wcstok +#define ACE_HAS_3_PARAM_WCSTOK + +// Visual Studio 2015 has adequate C++11 support +#define ACE_HAS_CPP11 + +#define ACE_PUTENV_EQUIVALENT ::_putenv +#define ACE_TEMPNAM_EQUIVALENT ::_tempnam +#define ACE_STRDUP_EQUIVALENT ::_strdup +#define ACE_MKDIR_EQUIVALENT ::_mkdir +#define ACE_ACCESS_EQUIVALENT ::_access +#define ACE_CHDIR_EQUIVALENT ::_chdir +#define ACE_RMDIR_EQUIVALENT ::_rmdir +#define ACE_GETCWD_EQUIVALENT ::_getcwd +#define ACE_SWAB_EQUIVALENT ::_swab +#define ACE_UNLINK_EQUIVALENT ::_unlink + +#define ACE_HAS_STRNLEN +#define ACE_HAS_WCSNLEN + +#define ACE_LACKS_STRUCT_DIR +#define ACE_LACKS_OPENDIR +#define ACE_LACKS_CLOSEDIR +#define ACE_LACKS_READDIR + +#define ACE_LACKS_MODE_T +#define ACE_LACKS_PID_T -#include "ace/config-win32-msvc-14.h" +#define ACE_LACKS_NLINK_T +#define ACE_LACKS_UID_T +#define ACE_LACKS_GID_T #if _MSVC_LANG >= 201402L # define ACE_HAS_CPP14 diff --git a/ACE/ace/config-win32-msvc.h b/ACE/ace/config-win32-msvc.h index 1e1b063d420..e467bf0230b 100644 --- a/ACE/ace/config-win32-msvc.h +++ b/ACE/ace/config-win32-msvc.h @@ -39,8 +39,6 @@ # include "ace/config-win32-msvc-142.h" #elif (_MSC_VER >= 1910) # include "ace/config-win32-msvc-141.h" -#elif (_MSC_VER >= 1900) -# include "ace/config-win32-msvc-14.h" #else # error This version of Microsoft Visual C++ is not supported. #endif -- cgit v1.2.1 From 9740e05c8e2f2c906444bf6b4ae01dd24e39cf39 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 20 Feb 2023 16:28:53 +0100 Subject: Enable C++14 for clang 5/6/7/8 * ACE/include/makeinclude/platform_linux_clang.GNU: --- ACE/include/makeinclude/platform_linux_clang.GNU | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/ACE/include/makeinclude/platform_linux_clang.GNU b/ACE/include/makeinclude/platform_linux_clang.GNU index 1bc22c06a02..48a5e346241 100644 --- a/ACE/include/makeinclude/platform_linux_clang.GNU +++ b/ACE/include/makeinclude/platform_linux_clang.GNU @@ -18,10 +18,18 @@ else CXX_MAJOR_VERSION := $(shell $(CXX) -dumpversion | sed -e 's/[^0-9\.]//g' | sed -e 's/\..*$$//') endif -# clang5 has C++03 as default C++ version, enable this to be C++11 -# the older clang versions all return 4.2.1 as part of dumpversion -ifeq ($(findstring $(CXX_MAJOR_VERSION),4),$(CXX_MAJOR_VERSION)) - c++11 ?= 1 +# clang5/6/7/8 have C++11 as default C++ version, enable this to be C++14 +ifeq ($(findstring $(CXX_MAJOR_VERSION),5),$(CXX_MAJOR_VERSION)) + c++14 ?= 1 +endif +ifeq ($(findstring $(CXX_MAJOR_VERSION),6),$(CXX_MAJOR_VERSION)) + c++14 ?= 1 +endif +ifeq ($(findstring $(CXX_MAJOR_VERSION),7),$(CXX_MAJOR_VERSION)) + c++14 ?= 1 +endif +ifeq ($(findstring $(CXX_MAJOR_VERSION),8),$(CXX_MAJOR_VERSION)) + c++14 ?= 1 endif CCFLAGS += $(CFLAGS) -- cgit v1.2.1 From fd5c368d5c7b26ff2a44446bd215e28ffc07b033 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 20 Feb 2023 16:35:04 +0100 Subject: Remove clang5 * .github/workflows/linux.yml: * ACE/include/makeinclude/platform_linux_clang.GNU: --- .github/workflows/linux.yml | 5 ----- ACE/include/makeinclude/platform_linux_clang.GNU | 14 -------------- 2 files changed, 19 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 50a5f38d2ff..a0f771a303c 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -62,11 +62,6 @@ jobs: optional_macros: CCFLAGS+=-std=c++20 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU os: ubuntu-22.04 - - CC: clang-5.0 - CXX: clang++-5.0 - PackageDeps: clang-5.0 - platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU - os: ubuntu-18.04 - CC: clang-6.0 CXX: clang++-6.0 PackageDeps: clang-6.0 diff --git a/ACE/include/makeinclude/platform_linux_clang.GNU b/ACE/include/makeinclude/platform_linux_clang.GNU index 48a5e346241..a0fed4aa604 100644 --- a/ACE/include/makeinclude/platform_linux_clang.GNU +++ b/ACE/include/makeinclude/platform_linux_clang.GNU @@ -18,20 +18,6 @@ else CXX_MAJOR_VERSION := $(shell $(CXX) -dumpversion | sed -e 's/[^0-9\.]//g' | sed -e 's/\..*$$//') endif -# clang5/6/7/8 have C++11 as default C++ version, enable this to be C++14 -ifeq ($(findstring $(CXX_MAJOR_VERSION),5),$(CXX_MAJOR_VERSION)) - c++14 ?= 1 -endif -ifeq ($(findstring $(CXX_MAJOR_VERSION),6),$(CXX_MAJOR_VERSION)) - c++14 ?= 1 -endif -ifeq ($(findstring $(CXX_MAJOR_VERSION),7),$(CXX_MAJOR_VERSION)) - c++14 ?= 1 -endif -ifeq ($(findstring $(CXX_MAJOR_VERSION),8),$(CXX_MAJOR_VERSION)) - c++14 ?= 1 -endif - CCFLAGS += $(CFLAGS) DCFLAGS += -g DLD = $(CXX) -- cgit v1.2.1 From 7ff7378063fb7a2cda02c096a55ec8319a9e7854 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 21 Feb 2023 07:09:31 +0100 Subject: Update ACE/ace/Global_Macros.h Co-authored-by: Fred Hornsey --- ACE/ace/Global_Macros.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ACE/ace/Global_Macros.h b/ACE/ace/Global_Macros.h index e43b1002dd4..5520938f01c 100644 --- a/ACE/ace/Global_Macros.h +++ b/ACE/ace/Global_Macros.h @@ -59,7 +59,7 @@ #if !defined (ACE_HAS_CPP14) # error ACE/TAO require C++14 compliance, please upgrade your compiler and/or fix the platform configuration for your environment -#endif /* !ACE_HAS_CPP11 */ +#endif #define ACE_UNIMPLEMENTED_FUNC(f) f = delete; -- cgit v1.2.1 From 06974e568d233fcf8f0550a5ebb9987588928ce3 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 21 Feb 2023 13:23:32 +0100 Subject: List Visual Studio 2015 EOL * ACE/NEWS: --- ACE/NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ACE/NEWS b/ACE/NEWS index ee0460be2b2..bb38cc3b52f 100644 --- a/ACE/NEWS +++ b/ACE/NEWS @@ -2,7 +2,7 @@ USER VISIBLE CHANGES BETWEEN ACE-7.0.11 and ACE-7.1.0 ===================================================== . Removed support for Windows CE, OpenVMS, HPUX, AIX, RTEMS, - Pharlap, and Solaris + Pharlap, Solaris, and Visual Studio 2015 . ACE/TAO now require C++14 or newer -- cgit v1.2.1 From cfc83e2d8bfa83ba08452767d8ab943f539e3ae8 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 21 Feb 2023 13:28:15 +0100 Subject: Make use of std::make_unique * TAO/tao/PortableServer/Active_Policy_Strategies.cpp: --- .../PortableServer/Active_Policy_Strategies.cpp | 32 +++++++++++----------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.cpp b/TAO/tao/PortableServer/Active_Policy_Strategies.cpp index a2a2ce4319b..244401662bf 100644 --- a/TAO/tao/PortableServer/Active_Policy_Strategies.cpp +++ b/TAO/tao/PortableServer/Active_Policy_Strategies.cpp @@ -99,13 +99,13 @@ namespace TAO case ::PortableServer::SINGLE_THREAD_MODEL : { #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_MICRO) && !defined (CORBA_E_COMPACT) - this->thread_strategy_.reset (new ThreadStrategySingle ()); + this->thread_strategy_ = std::make_unique (); #endif /* TAO_HAS_MINIMUM_POA == 0 */ break; } case ::PortableServer::ORB_CTRL_MODEL : { - this->thread_strategy_.reset (new ThreadStrategyORBControl ()); + this->thread_strategy_ = std::make_unique (); break; } } @@ -118,13 +118,13 @@ namespace TAO { case ::PortableServer::SYSTEM_ID : { - this->id_assignment_strategy_.reset (new IdAssignmentStrategySystem ()); + this->id_assignment_strategy_ = std::make_unique (); break; } case ::PortableServer::USER_ID : { #if !defined (CORBA_E_MICRO) - this->id_assignment_strategy_.reset (new IdAssignmentStrategyUser ()); + this->id_assignment_strategy_ = std::make_unique (); #endif /* CORBA_E_MICRO */ break; } @@ -139,13 +139,13 @@ namespace TAO case ::PortableServer::MULTIPLE_ID : { #if !defined (CORBA_E_MICRO) - this->id_uniqueness_strategy_.reset (new IdUniquenessStrategyMultiple ()); + this->id_uniqueness_strategy_ = std::make_unique (); #endif /* CORBA_E_MICRO */ break; } case ::PortableServer::UNIQUE_ID : { - this->id_uniqueness_strategy_.reset (new IdUniquenessStrategyUnique ()); + this->id_uniqueness_strategy_ = std::make_unique (); break; } } @@ -158,13 +158,13 @@ namespace TAO { case ::PortableServer::RETAIN : { - this->servant_retention_strategy_.reset (new ServantRetentionStrategyRetain ()); + this->servant_retention_strategy_ = std::make_unique (); break; } case ::PortableServer::NON_RETAIN : { #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_MICRO) && !defined (CORBA_E_COMPACT) - this->servant_retention_strategy_.reset (new ServantRetentionStrategyNonRetain ()); + this->servant_retention_strategy_ = std::make_unique (); #endif /* TAO_HAS_MINIMUM_POA == 0 */ break; } @@ -179,13 +179,13 @@ namespace TAO case ::PortableServer::PERSISTENT : { #if !defined (CORBA_E_MICRO) - this->lifespan_strategy_.reset (new LifespanStrategyPersistent ()); + this->lifespan_strategy_ = std::make_unique (); #endif /* CORBA_E_MICRO */ break; } case ::PortableServer::TRANSIENT : { - this->lifespan_strategy_.reset (new LifespanStrategyTransient ()); + this->lifespan_strategy_ = std::make_unique (); break; } } @@ -199,13 +199,13 @@ namespace TAO case ::PortableServer::IMPLICIT_ACTIVATION : { #if !defined (CORBA_E_MICRO) && !defined (CORBA_E_COMPACT) - this->implicit_activation_strategy_.reset (new ImplicitActivationStrategyImplicit ()); + this->implicit_activation_strategy_= std::make_unique (); #endif /* CORBA_E_MICRO */ break; } case ::PortableServer::NO_IMPLICIT_ACTIVATION : { - this->implicit_activation_strategy_.reset (new ImplicitActivationStrategyExplicit ()); + this->implicit_activation_strategy_ = std::make_unique (); break; } } @@ -220,13 +220,13 @@ namespace TAO { case ::PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY : { - this->request_processing_strategy_.reset (new RequestProcessingStrategyAOMOnly ()); + this->request_processing_strategy_ = std::make_unique (); break; } case ::PortableServer::USE_DEFAULT_SERVANT : { #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - this->request_processing_strategy_.reset (new RequestProcessingStrategyDefaultServant ()); + this->request_processing_strategy_ = std::make_unique (); #endif /* TAO_HAS_MINIMUM_POA == 0 */ break; } @@ -237,14 +237,14 @@ namespace TAO case ::PortableServer::RETAIN : { #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - this->request_processing_strategy_.reset (new RequestProcessingStrategyServantActivator ()); + this->request_processing_strategy_ = std::make_unique (); #endif /* TAO_HAS_MINIMUM_POA == 0 */ break; } case ::PortableServer::NON_RETAIN : { #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - this->request_processing_strategy_.reset (new RequestProcessingStrategyServantLocator ()); + this->request_processing_strategy_ = std::make_unique (); #endif /* TAO_HAS_MINIMUM_POA == 0 */ break; } -- cgit v1.2.1 From c5b4f7009b47eac331fb5d20d53366fc99abecf0 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 21 Feb 2023 14:20:11 +0100 Subject: ACE/ace/SSL/SSL_Asynch_BIO.cpp: fix build with libressl >= 3.5.0 Fix the following build failure with libressl >= 3.5.0: /tmp/instance-17/output-1/build/ace-7.0.6/ace/SSL/SSL_Asynch_BIO.cpp:45:19: error: variable 'BIO_METHOD methods_ACE' has initializer but incomplete type 45 | static BIO_METHOD methods_ACE = | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/7f40d6dde03134238151c248fbbd66e4713546cb Signed-off-by: Fabrice Fontaine --- ACE/ace/SSL/SSL_Asynch_BIO.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ACE/ace/SSL/SSL_Asynch_BIO.cpp b/ACE/ace/SSL/SSL_Asynch_BIO.cpp index 0faa775fc0f..0317ccbd12c 100644 --- a/ACE/ace/SSL/SSL_Asynch_BIO.cpp +++ b/ACE/ace/SSL/SSL_Asynch_BIO.cpp @@ -41,7 +41,7 @@ extern "C" #define BIO_TYPE_ACE ( 21 | BIO_TYPE_SOURCE_SINK ) -#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) +#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) static BIO_METHOD methods_ACE = { BIO_TYPE_ACE, // BIO_TYPE_PROXY_SERVER, @@ -68,14 +68,14 @@ static BIO_METHOD methods_ACE = #else static BIO_METHOD* methods_ACE; # define BIO_set_num(b, val) -#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */ +#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) */ ACE_BEGIN_VERSIONED_NAMESPACE_DECL BIO * ACE_SSL_make_BIO (void * ssl_asynch_stream) { -#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) +#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) BIO * const pBIO = BIO_new (&methods_ACE); #else if (!methods_ACE) -- cgit v1.2.1 From 458c39a5fcaac2f79eb7878b8b052ad89fba1b13 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 21 Feb 2023 16:05:14 +0100 Subject: Try gcc6 on ubuntu 20.04 as 18.04 is going to be unsupported on github actions soon * .github/workflows/linux.yml: --- .github/workflows/linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index a0f771a303c..1223c5d25da 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -28,7 +28,7 @@ jobs: CXX: g++-6 PackageDeps: g++-6 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU - os: ubuntu-18.04 + os: ubuntu-20.04 - CC: gcc-7 CXX: g++-7 PackageDeps: g++-7 -- cgit v1.2.1 From d36ea8bd1ba6f2fefa13124562bdd534cbc96515 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 21 Feb 2023 20:07:05 +0100 Subject: Removed gcc6, not available on ubuntu 20.04 without a special repo (not tested that) * .github/workflows/linux.yml: --- .github/workflows/linux.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 1223c5d25da..8524c860e2d 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -24,11 +24,6 @@ jobs: fail-fast: false matrix: include: - - CC: gcc-6 - CXX: g++-6 - PackageDeps: g++-6 - platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU - os: ubuntu-20.04 - CC: gcc-7 CXX: g++-7 PackageDeps: g++-7 -- cgit v1.2.1 From 606a42cd58a161c971723d10713699d922530a28 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 22 Feb 2023 09:10:40 +0100 Subject: Add define of ACE_WIN32_VC14, before dropping Visual Studio 2015 this was also set for newer Visual Studio versions * ACE/ace/config-win32-msvc-141.h: --- ACE/ace/config-win32-msvc-141.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ACE/ace/config-win32-msvc-141.h b/ACE/ace/config-win32-msvc-141.h index e08e69ae736..284071e62ed 100644 --- a/ACE/ace/config-win32-msvc-141.h +++ b/ACE/ace/config-win32-msvc-141.h @@ -19,6 +19,9 @@ #error Use config-win32.h in config.h instead of this header #endif /* ACE_CONFIG_WIN32_H */ +#ifndef ACE_WIN32_VC14 +# define ACE_WIN32_VC14 +#endif #ifndef ACE_WIN32_VC141 # define ACE_WIN32_VC141 #endif -- cgit v1.2.1 From 017929ad88287a15cf7733bc5bacc1782e647a22 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 22 Feb 2023 14:57:09 +0100 Subject: Set ACE_HAS_CPP20 when C++20 is supported * ACE/ace/config-win32-msvc-141.h: --- ACE/ace/config-win32-msvc-141.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ACE/ace/config-win32-msvc-141.h b/ACE/ace/config-win32-msvc-141.h index 284071e62ed..60de5347739 100644 --- a/ACE/ace/config-win32-msvc-141.h +++ b/ACE/ace/config-win32-msvc-141.h @@ -138,5 +138,9 @@ # define ACE_HAS_CPP17 #endif /* _MSVC_LANG >= 201703L */ +#if _MSVC_LANG >= 202002L +# define ACE_HAS_CPP20 +#endif /* _MSVC_LANG >= 202002L */ + #include /**/ "ace/post.h" #endif /* ACE_CONFIG_WIN32_MSVC_141_H */ -- cgit v1.2.1 From 26ed33ba535cc904c88c4405f58e7e67343096eb Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 27 Feb 2023 08:05:05 +0100 Subject: Ruby 3.1 ships ucrt which has a 3 param wcstok * ACE/ace/config-win32-mingw64.h: --- ACE/ace/config-win32-mingw64.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ACE/ace/config-win32-mingw64.h b/ACE/ace/config-win32-mingw64.h index f7414ebda54..1d378aa1e23 100644 --- a/ACE/ace/config-win32-mingw64.h +++ b/ACE/ace/config-win32-mingw64.h @@ -128,5 +128,10 @@ #define ACE_DLL_PREFIX ACE_TEXT ("lib") +#if defined(_UCRT) +# define ACE_HAS_3_PARAM_WCSTOK +#endif + + #include /**/ "ace/post.h" #endif /* ACE_CONFIG_WIN32_MINGW64_H */ -- cgit v1.2.1 From adb7bcc177df26ef326fa00148d64aac810abe32 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 27 Feb 2023 10:08:04 +0100 Subject: Fix redefinition warnings when using mingw64 with ucrt * ACE/ace/os_include/sys/os_mman.h: --- ACE/ace/os_include/sys/os_mman.h | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/ACE/ace/os_include/sys/os_mman.h b/ACE/ace/os_include/sys/os_mman.h index 6671ffd1c86..8870bf22f5c 100644 --- a/ACE/ace/os_include/sys/os_mman.h +++ b/ACE/ace/os_include/sys/os_mman.h @@ -49,22 +49,25 @@ extern "C" # define MAP_FIXED 0 #elif defined (ACE_WIN32) // These two may be used for internal flags soon: -# define MAP_PRIVATE 1 -# define MAP_SHARED 2 -# define MAP_FIXED 4 +# if !defined (MAP_PRIVATE) +# define MAP_PRIVATE 1 +# endif +# if !defined (MAP_SHARED) +# define MAP_SHARED 2 +# endif +# if !defined (MAP_FIXED) +# define MAP_FIXED 4 +# endif // MMAP flags -# define PROT_READ PAGE_READONLY -# define PROT_WRITE PAGE_READWRITE -# define PROT_RDWR PAGE_READWRITE -/* If we can find suitable use for these flags, here they are: -PAGE_WRITECOPY -PAGE_EXECUTE -PAGE_EXECUTE_READ -PAGE_EXECUTE_READWRITE -PAGE_EXECUTE_WRITECOPY -PAGE_GUARD -PAGE_NOACCESS -PAGE_NOCACHE */ +# if !defined (PROT_READ) +# define PROT_READ PAGE_READONLY +# endif +# if !defined (PROT_WRITE) +# define PROT_WRITE PAGE_READWRITE +# endif +# if !defined (PROT_RDWR) +# define PROT_RDWR PAGE_READWRITE +# endif #endif /* !ACE_LACKS_SYS_MMAN_H && !ACE_WIN32*/ # if !defined (ACE_MAP_PRIVATE) -- cgit v1.2.1 From 6c47c90806a1ad9be33784d5f731d360814e4137 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 3 Mar 2023 09:14:01 +0100 Subject: ACE+TAO-7_1_0 --- ACE/ChangeLogs/ACE-7_1_0 | 727 ++++++++++++++++++++++++++++++++++++++++++++++ ACE/PROBLEM-REPORT-FORM | 2 +- ACE/VERSION.txt | 2 +- ACE/ace/Version.h | 8 +- ACE/debian/control | 62 ++-- ACE/rpmbuild/ace-tao.spec | 4 +- TAO/ChangeLogs/TAO-3_1_0 | 393 +++++++++++++++++++++++++ TAO/PROBLEM-REPORT-FORM | 4 +- TAO/VERSION.txt | 2 +- TAO/tao/Version.h | 8 +- 10 files changed, 1166 insertions(+), 46 deletions(-) create mode 100644 ACE/ChangeLogs/ACE-7_1_0 create mode 100644 TAO/ChangeLogs/TAO-3_1_0 diff --git a/ACE/ChangeLogs/ACE-7_1_0 b/ACE/ChangeLogs/ACE-7_1_0 new file mode 100644 index 00000000000..4a00ae7d580 --- /dev/null +++ b/ACE/ChangeLogs/ACE-7_1_0 @@ -0,0 +1,727 @@ +commit 419b7060685fe7df63f0a91bc64bcaf9848a84fb +Merge: 1a0d76d1c62 adb7bcc177d +Author: Johnny Willemsen +Date: Mon Feb 27 12:14:49 2023 +0100 + + Merge pull request #2056 from jwillemsen/jwi-osmmanredef + + Fix redefinition warnings when using mingw64 with ucrt + +commit 1a0d76d1c6251067df8a2c18816b2316b6950dfa +Merge: 7b119e54bbb 26ed33ba535 +Author: Johnny Willemsen +Date: Mon Feb 27 11:07:53 2023 +0100 + + Merge pull request #2055 from jwillemsen/jwi-curtfix + + Ruby 3.1 ships ucrt which has a 3 param wcstok + +commit adb7bcc177df26ef326fa00148d64aac810abe32 +Author: Johnny Willemsen +Date: Mon Feb 27 10:08:04 2023 +0100 + + Fix redefinition warnings when using mingw64 with ucrt + + * ACE/ace/os_include/sys/os_mman.h: + +commit 26ed33ba535cc904c88c4405f58e7e67343096eb +Author: Johnny Willemsen +Date: Mon Feb 27 08:05:05 2023 +0100 + + Ruby 3.1 ships ucrt which has a 3 param wcstok + + * ACE/ace/config-win32-mingw64.h: + +commit 7b119e54bbbcaeeec03cf2e6e7a3ff889e08fd12 +Merge: c0ef1f6daad 3827363c2df +Author: Johnny Willemsen +Date: Thu Feb 23 09:26:26 2023 +0100 + + Merge pull request #2053 from ffontaine/master + + ACE/ace/SSL/SSL_Asynch_BIO.cpp: fix build with libressl >= 3.5.0 + +commit 017929ad88287a15cf7733bc5bacc1782e647a22 +Author: Johnny Willemsen +Date: Wed Feb 22 14:57:09 2023 +0100 + + Set ACE_HAS_CPP20 when C++20 is supported + + * ACE/ace/config-win32-msvc-141.h: + +commit 3827363c2dfe94345cab759b5b968eeec89205b4 +Merge: c5b4f7009b4 4ea44f59178 +Author: Johnny Willemsen +Date: Wed Feb 22 13:32:52 2023 +0100 + + Merge branch 'master' into master + +commit 606a42cd58a161c971723d10713699d922530a28 +Author: Johnny Willemsen +Date: Wed Feb 22 09:10:40 2023 +0100 + + Add define of ACE_WIN32_VC14, before dropping Visual Studio 2015 this was also set for newer Visual Studio versions + + * ACE/ace/config-win32-msvc-141.h: + +commit c5b4f7009b47eac331fb5d20d53366fc99abecf0 +Author: Fabrice Fontaine +Date: Tue Feb 21 14:20:11 2023 +0100 + + ACE/ace/SSL/SSL_Asynch_BIO.cpp: fix build with libressl >= 3.5.0 + + Fix the following build failure with libressl >= 3.5.0: + + /tmp/instance-17/output-1/build/ace-7.0.6/ace/SSL/SSL_Asynch_BIO.cpp:45:19: error: variable 'BIO_METHOD methods_ACE' has initializer but incomplete type + 45 | static BIO_METHOD methods_ACE = + | ^~~~~~~~~~~ + + Fixes: + - http://autobuild.buildroot.org/results/7f40d6dde03134238151c248fbbd66e4713546cb + + Signed-off-by: Fabrice Fontaine + +commit 06974e568d233fcf8f0550a5ebb9987588928ce3 +Author: Johnny Willemsen +Date: Tue Feb 21 13:23:32 2023 +0100 + + List Visual Studio 2015 EOL + + * ACE/NEWS: + +commit 7ff7378063fb7a2cda02c096a55ec8319a9e7854 +Author: Johnny Willemsen +Date: Tue Feb 21 07:09:31 2023 +0100 + + Update ACE/ace/Global_Macros.h + + Co-authored-by: Fred Hornsey + +commit fd5c368d5c7b26ff2a44446bd215e28ffc07b033 +Author: Johnny Willemsen +Date: Mon Feb 20 16:35:04 2023 +0100 + + Remove clang5 + + * .github/workflows/linux.yml: + * ACE/include/makeinclude/platform_linux_clang.GNU: + +commit 9740e05c8e2f2c906444bf6b4ae01dd24e39cf39 +Author: Johnny Willemsen +Date: Mon Feb 20 16:28:53 2023 +0100 + + Enable C++14 for clang 5/6/7/8 + + * ACE/include/makeinclude/platform_linux_clang.GNU: + +commit 46e095cc536cb302af7bef33c79f3c93977df343 +Author: Johnny Willemsen +Date: Mon Feb 20 15:48:34 2023 +0100 + + Removed Visual Studio 2015 support, lacks C++14 + + * ACE/ace/config-win32-msvc-14.h: + Deleted. + + * ACE/ace/config-win32-msvc-141.h: + * ACE/ace/config-win32-msvc.h: + +commit 7a7f6db56d3a136c765558ace03eda3845d9f3a3 +Author: Johnny Willemsen +Date: Mon Feb 20 15:44:04 2023 +0100 + + ACE/TAO now require C++14 or newer + + * ACE/NEWS: + * ACE/ace/Global_Macros.h: + * ACE/ace/config-win32-msvc-141.h: + * ACE/examples/Logger/Acceptor-server/server_loggerd.cpp: + * ACE/include/makeinclude/platform_linux_clang.GNU: + * ACE/include/makeinclude/platform_macosx_common.GNU: + +commit d19030946af88f57a4b2b29af9228cbbf0386a71 +Author: Johnny Willemsen +Date: Mon Feb 13 18:08:58 2023 +0100 + + Revert one constexpr change + + * ACE/apps/gperf/src/Key_List.cpp: + +commit 90371aba592ff8153762036e2b0d5bd723af4a7d +Author: Johnny Willemsen +Date: Mon Feb 13 17:04:25 2023 +0100 + + Generate some parts as constexpr + + * ACE/apps/gperf/src/Key_List.cpp: + +commit 4db6c4351dfd785f59a9b16122e52eeec44520c0 +Author: Johnny Willemsen +Date: Mon Feb 13 12:30:59 2023 +0100 + + Fixed unresolved exports, more override + + * ACE/protocols/ace/HTBP/HTBP_Addr.cpp: + * ACE/protocols/ace/HTBP/HTBP_Addr.h: + * TAO/tao/PortableServer/Active_Object_Map.cpp: + * TAO/tao/PortableServer/Active_Object_Map.h: + * TAO/tao/PortableServer/Active_Policy_Strategies.h: + * TAO/tao/PortableServer/Active_Policy_Strategies.inl: + * TAO/tao/PortableServer/IdUniquenessStrategy.h: + * TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp: + * TAO/tao/PortableServer/Operation_Table_Binary_Search.h: + * TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h: + * TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp: + * TAO/tao/PortableServer/Operation_Table_Linear_Search.h: + * TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp: + * TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h: + * TAO/tao/PortableServer/POA_Current_Factory.cpp: + * TAO/tao/PortableServer/POA_Current_Impl.cpp: + * TAO/tao/PortableServer/POA_Current_Impl.h: + * TAO/tao/PortableServer/POA_Policy_Set.h: + * TAO/tao/PortableServer/ServantRetentionStrategy.h: + +commit 69fbec6c475060cf01a710a3d7ed6e756538858c +Merge: 7e8b94b728b 89a05c65fd6 +Author: Johnny Willemsen +Date: Mon Feb 6 09:21:37 2023 +0100 + + Merge pull request #2046 from jwillemsen/jwinullptrexce + + Use nullptr and make destructor of TAO SystemException default + +commit 89a05c65fd627673f0bcc260b990257dcf30150c +Author: Johnny Willemsen +Date: Fri Feb 3 19:49:52 2023 +0100 + + Use nullptr + + * ACE/ace/Time_Policy.h: + * ACE/ace/Time_Policy.inl: + +commit 7e8b94b728b886d14fc17b6af789e9ba0c50a050 +Merge: 4961b8026b5 ec19b2725b5 +Author: Johnny Willemsen +Date: Thu Feb 2 09:13:03 2023 +0100 + + Merge pull request #2042 from jwillemsen/jwi-cleanupmacros + + Cleanup unused macros + +commit 4961b8026b5c90e2517f27f9d9d5584be6f94ab0 +Merge: 757fd0a5eef 007bcf039e9 +Author: Johnny Willemsen +Date: Thu Feb 2 09:10:49 2023 +0100 + + Merge pull request #2044 from jmccabe/Indent-endif-by-an-extra-space + + Align one endif with its associated if + +commit 757fd0a5eef53e1c9e1a8327eb5d4b34e81d7cb9 +Merge: 107d2bfea7c 7f4365e6544 +Author: Johnny Willemsen +Date: Thu Feb 2 09:09:17 2023 +0100 + + Merge pull request #2043 from jwillemsen/jwi-pharlapcleanup + + Removed pharlap support + +commit 007bcf039e9226a746bffbc0dcffa892c091adbe +Author: John McCabe +Date: Wed Feb 1 16:51:54 2023 +0000 + + Align one endif with its associated if + +commit d90c1cb3964f254cb5e9a0de2d7f620b79750e16 +Author: Johnny Willemsen +Date: Wed Feb 1 16:01:29 2023 +0100 + + Removed left over sun file + +commit 7f4365e65442e6c9d482fa64f808303f1546fe68 +Author: Johnny Willemsen +Date: Wed Feb 1 15:52:25 2023 +0100 + + Fixed cleanup mistake + + * ACE/ace/OS_NS_unistd.inl: + +commit 6198126ce20cc418252f461621c81d19ee2b36e4 +Author: Johnny Willemsen +Date: Wed Feb 1 15:44:33 2023 +0100 + + Removed pharlap support + +commit 1eb5c6564e45cce7980f6bbac7b4b073b806788c +Author: Johnny Willemsen +Date: Wed Feb 1 14:48:42 2023 +0100 + + Removed include + + * ACE/ace/OS_NS_unistd.cpp: + +commit 281078a59a44ca971675b90616f5e35a998bf077 +Author: Johnny Willemsen +Date: Wed Feb 1 14:41:51 2023 +0100 + + Removed os_include headers which don't include any file anymore + +commit 9d3475584970e20117a7a99d3a75fecb521a0da9 +Author: Johnny Willemsen +Date: Wed Feb 1 14:38:17 2023 +0100 + + Further cleanup not used macros + + * ACE/ace/IOStream.h: + * ACE/ace/OS_NS_Thread.cpp: + * ACE/ace/OS_NS_Thread.inl: + * ACE/ace/Profile_Timer.cpp: + * ACE/ace/README: + * ACE/ace/os_include/os_netdb.h: + * ACE/ace/os_include/sys/os_loadavg.h: + * ACE/ace/os_include/sys/os_pstat.h: + +commit 01cb9ff254befab9c674e957a9e063b3c09bcc26 +Author: Johnny Willemsen +Date: Wed Feb 1 10:56:12 2023 +0100 + + Fix + + * ACE/ace/CDR_Stream.inl: + +commit c3e71f69e85deb48d5f3cdba355679da4deffdb3 +Author: Johnny Willemsen +Date: Wed Feb 1 10:51:23 2023 +0100 + + good_bit is a bool and removed some uncessary c-style casts + +commit 980b4296358a1b3f0f3ffde85c2826eeeb240637 +Author: Johnny Willemsen +Date: Wed Jan 18 13:21:32 2023 +0100 + + Fixed warning + + * ACE/ace/OS_NS_Thread.inl: + +commit dfc5c60f27c6ea1f566b1819ebbc3d979c19ffad +Merge: 956dcabf4bd d97b6edbeeb +Author: Johnny Willemsen +Date: Wed Jan 18 10:14:13 2023 +0100 + + Merge pull request #2035 from jwillemsen/jwi-cleanupsolaris + + Cleanup Solaris support + +commit d97b6edbeeb9a007f65e10e069a753bc087e998f +Author: Johnny Willemsen +Date: Tue Jan 17 16:38:01 2023 +0100 + + Updated for release + + * ACE/NEWS: + +commit 956dcabf4bdd4fb3ec1be53c392398b495af27cf +Merge: 016eb1b3caa 461fcfe1d09 +Author: Johnny Willemsen +Date: Tue Jan 17 15:41:34 2023 +0100 + + Merge pull request #2030 from lockhart/rpm_extras_7_0_11 + + Add headers and other source files to the list of files to be installed. + +commit ffbcea5aea4d73a2cb04c4c128662c4672f95d0d +Author: Johnny Willemsen +Date: Tue Jan 17 15:26:19 2023 +0100 + + More cleanup + + * ACE/ace/OS_NS_Thread.cpp: + * ACE/ace/OS_NS_Thread.inl: + * ACE/ace/config-hurd.h: + * ACE/ace/os_include/os_unistd.h: + * ACE/ace/os_include/sys/os_mman.h: + +commit 94724143a88b7ad5b10194690d9d73db3a3b6c54 +Author: Johnny Willemsen +Date: Tue Jan 17 12:43:59 2023 +0100 + + More Sun OS/compiler cleanup + +commit a7f809c172f0a2578ab584920dc02f1e45c06e6d +Author: Johnny Willemsen +Date: Tue Jan 17 12:40:30 2023 +0100 + + More Sun OS/compiler cleanup + +commit 83567bb4eb3abc1133a10a8cd3a97e4dfd1f23f8 +Author: Johnny Willemsen +Date: Tue Jan 17 12:35:36 2023 +0100 + + Removed some unused defines + +commit 5a45b0554cf1649e5f1eddebde2aa22df6c69719 +Author: Johnny Willemsen +Date: Tue Jan 17 12:33:05 2023 +0100 + + More Sun OS/compiler cleanup + +commit e5391a0076f5e370f929b111a8a6ed52ee4cb5da +Author: Johnny Willemsen +Date: Tue Jan 17 12:32:56 2023 +0100 + + More Sun OS/compiler cleanup + +commit 654bdcf1600bc5f2ada5790cb0a6a3418a8cc8d3 +Author: Johnny Willemsen +Date: Tue Jan 17 09:46:42 2023 +0100 + + Fixed cleanup issues + + * ACE/ace/OS_NS_Thread.h: + * ACE/ace/POSIX_Proactor.cpp: + +commit 73bdf800479e53a11143735e48348bb88c527c24 +Author: Johnny Willemsen +Date: Tue Jan 17 09:44:30 2023 +0100 + + Cleanup Solaris support + +commit 016eb1b3caa7b8ba0ff4c479895151eca984c82b +Merge: cf4d1e0117b 3f2b66203cb +Author: Johnny Willemsen +Date: Tue Jan 17 08:30:27 2023 +0100 + + Merge pull request #2034 from jwillemsen/jwi-macrocleanup + + Cleanup several macros which are not set by any config file + +commit 461fcfe1d099e9dc4e10b38ce7b19d922a368869 +Author: lockhart +Date: Mon Jan 16 22:22:39 2023 -0800 + + Update ace-tao.spec + + Need yet more .cpp files from ACE and TAO subsystems to enable a clean build of an external project. + +commit d6c603febcd87d749e3babb7cbe3386cd76a3c18 +Author: lockhart +Date: Mon Jan 16 11:09:08 2023 -0800 + + Update ace-tao.spec + + Tailor previous updates to the list of installed files to remove most duplicates and commented-out lines. + This includes one explicit line for the ESF/ subdirectory since at least one .cpp is needed but does not match the other patterns. + Updates are based on feedback from Johnny W. + +commit 3f2b66203cbef9985486a6e9ce4ef33feb5cfb20 +Author: Johnny Willemsen +Date: Mon Jan 16 18:49:33 2023 +0100 + + Cleanup several macros which are not set by any config file + + * ACE/ace/OS_NS_Thread.cpp: + * ACE/ace/OS_NS_dirent.inl: + * ACE/ace/OS_NS_sys_stat.inl: + * ACE/ace/OS_NS_time.cpp: + * ACE/ace/OS_NS_time.h: + * ACE/ace/OS_NS_time.inl: + * ACE/ace/OS_NS_unistd.inl: + * ACE/ace/README: + * ACE/ace/TLI.cpp: + * ACE/ace/os_include/os_stropts.h: + * ACE/ace/os_include/sys/os_mman.h: + +commit dcb4692364d4a9175db59b9280dbbd54524bb3ce +Author: Johnny Willemsen +Date: Mon Jan 16 16:45:00 2023 +0100 + + Removed checks for ACE_TEMPLATES_REQUIRE_SOURCE + +commit f25410e018ff6b65ec24df5ba249447f74eb0198 +Author: Johnny Willemsen +Date: Mon Jan 16 15:47:01 2023 +0100 + + Removed AIX support + +commit fd9764555ac1865589fe02dcd8201ab3d91e7030 +Author: Johnny Willemsen +Date: Mon Jan 16 15:46:41 2023 +0100 + + Removed AIX support + +commit a1a1a43595697bb82a040368286340f94b24c122 +Author: Thomas Lockhart +Date: Sun Jan 15 19:45:57 2023 -0800 + + Add headers and other source files to the list of files to be installed. + This includes stubs and skeletons for IDL interfaces and files required to extend interfaces. + This is a superset of files which are known to be required to build external packages. + +commit b2b2abd13518168f2b2930d4dd157d5311dccbe5 +Author: Johnny Willemsen +Date: Sun Jan 15 16:51:22 2023 +0100 + + Removed RTEMS support + +commit 61cab1e92cb345f27ddde5aa78787b9565b81121 +Author: Johnny Willemsen +Date: Sun Jan 15 16:51:08 2023 +0100 + + Removed RTEMS support + +commit d645bf461a41039dda402e1674ed7a6d40620957 +Merge: c9c577ffbe6 098b5aa5257 +Author: Johnny Willemsen +Date: Sun Jan 15 16:14:12 2023 +0100 + + Merge pull request #2028 from jwillemsen/jwi-removehpux + + Remove HPUX support + +commit c9c577ffbe64efca48e6a05add0e0070add7da6d +Merge: 6f36dbed40c 0a572bec884 +Author: Johnny Willemsen +Date: Sun Jan 15 14:04:11 2023 +0100 + + Merge pull request #2027 from jwillemsen/jwi-openvmscleanup + + Removed some OpenVMS code + +commit 098b5aa525738b909ba9bca915cc53c8a5573c20 +Author: Johnny Willemsen +Date: Sun Jan 15 13:53:46 2023 +0100 + + Update FIFO_Test.cpp + +commit b5aeaf20ef9d15d09acb52b4c8ac77762937ae26 +Author: Johnny Willemsen +Date: Sun Jan 15 12:28:28 2023 +0100 + + More cleanup + + * ACE/ace/config-linux-common.h: + * ACE/ace/config-macros.h: + * TAO/TAO_IDL/fe/idl.yy.cpp: + +commit aceac7234ef1ef995de5ade1e4daa27220960fb3 +Author: Johnny Willemsen +Date: Sun Jan 15 11:17:04 2023 +0100 + + More cleanup + + * ACE/ace/README: + * ACE/ace/os_include/sys/os_socket.h: + +commit 041537498bf9bc6cd673518b79b56c152579ac13 +Author: Johnny Willemsen +Date: Sun Jan 15 11:16:01 2023 +0100 + + Fixed cleanup mistakes + + * ACE/ace/os_include/os_pthread.h: + * ACE/ace/os_include/sys/os_socket.h: + +commit da66efe89c66a7997f6728759c196643c3910018 +Author: Johnny Willemsen +Date: Sun Jan 15 11:02:36 2023 +0100 + + Updated NEWS files + +commit b30753f1a1b18c831e89223ec01db66231b5a64a +Author: Johnny Willemsen +Date: Sun Jan 15 11:01:49 2023 +0100 + + Removed HPUX support + +commit 0a572bec8848eabb70c652fffa043ec335f45454 +Author: Johnny Willemsen +Date: Sun Jan 15 10:34:15 2023 +0100 + + Removed some OpenVMS code + + * ACE/ace/SSL/SSL_Context.cpp: + * ACE/ace/Sock_Connect.cpp: + * TAO/TAO-INSTALL.html: + +commit 6f36dbed40cbedb60f2c40376d360c704d7db93b +Merge: f06824b2d9f b488f1ab871 +Author: Johnny Willemsen +Date: Sun Jan 15 10:33:43 2023 +0100 + + Merge pull request #2023 from esohns/issue_2016_move_make_qword + + move ACE_Make_QWORD to OS_NS_macros.h + +commit 54ee4626edad4d98513a330beb2acf4a3a0596b7 +Author: Johnny Willemsen +Date: Sat Jan 14 16:26:19 2023 +0100 + + Removed openvms config files + +commit 9f5b645ee9d959b538c3b26d2b42c20ec0c227be +Author: Johnny Willemsen +Date: Sat Jan 14 12:55:48 2023 +0100 + + Update Process_Manager_Test.cpp + +commit 3a1440fc22d845cc46125af05c5fec96a8090674 +Author: Johnny Willemsen +Date: Sat Jan 14 11:46:06 2023 +0100 + + Update Process_Manager_Test.cpp + +commit 1996ba72caf059aaddc4cc3883fff329cf22dcf9 +Author: Johnny Willemsen +Date: Sat Jan 14 11:37:31 2023 +0100 + + Update os_types.h + +commit 2916b2fa78bc0fdcae44b590af9543245d481e15 +Author: Johnny Willemsen +Date: Sat Jan 14 10:09:54 2023 +0100 + + Removed OpenVMS support + +commit 20da1c5dcbed95befc08ccf258f62c91a16762f4 +Merge: 158938dceab cc5865a9582 +Author: Johnny Willemsen +Date: Sat Jan 14 09:53:44 2023 +0100 + + Merge pull request #2014 from jwillemsen/jwi-doxygen196 + + Upgrade doxygen configuration files to latest doxygen release + +commit b488f1ab8719835737d42ba4658cd18f352d0ad4 +Author: Erik Sohns +Date: Fri Jan 13 17:37:00 2023 +0100 + + move ACE_Make_QWORD to OS_NS_macros.h + +commit f59d4713c14113a6889656296896e9042468ced0 +Author: Johnny Willemsen +Date: Fri Jan 13 16:13:13 2023 +0100 + + Cleanup another not used define + + * ACE/ace/OS_NS_unistd.inl: + +commit a5662cef58b5c9377120dfa4b3a8098113be2594 +Author: Johnny Willemsen +Date: Fri Jan 13 14:27:50 2023 +0100 + + Cleanup workarounds which we don't need anymore + + * ACE/ace/OS_NS_stdlib.cpp: + * ACE/ace/OS_NS_sys_resource.inl: + * ACE/ace/OS_NS_sys_time.inl: + * ACE/ace/OS_NS_unistd.cpp: + * ACE/ace/OS_NS_unistd.inl: + * ACE/ace/os_include/os_errno.h: + * ACE/ace/os_include/os_signal.h: + * ACE/ace/os_include/sys/os_types.h: + +commit cde8fd193652205cf84a9ef5f74775000f0c9807 +Author: Johnny Willemsen +Date: Fri Jan 13 13:53:24 2023 +0100 + + Fixed cleanup error + + * ACE/tests/Proactor_Test_IPV6.cpp: + +commit 3f7247d33935f6451bd13835015cf7bf53b50969 +Author: Johnny Willemsen +Date: Fri Jan 13 13:08:57 2023 +0100 + + Fixed cleanup error + + * ACE/ace/config-win32-common.h: + * ACE/ace/config-win32-msvc.h: + +commit bbb975d6dee09baaad4e2b0425a0afb20b784005 +Author: Johnny Willemsen +Date: Fri Jan 13 12:52:36 2023 +0100 + + Fixed cleanup error + + * ACE/ace/OS_NS_Thread.inl: + +commit d1921e1511f65cd42503e8eeecfd301f5c3358b4 +Author: Johnny Willemsen +Date: Fri Jan 13 12:40:18 2023 +0100 + + Fixed cleanup error + + * ACE/ace/config-macros.h: + +commit 22359d30f11aa48abba5a3ad7bad7bed7489ff5b +Author: Johnny Willemsen +Date: Fri Jan 13 12:36:49 2023 +0100 + + Fixed cleanup mistakes + + * ACE/ace/OS_NS_Thread.inl: + * ACE/ace/OS_NS_stdio.inl: + * ACE/tests/Bug_3943_Regression_Test.cpp: + +commit 8f0f05f51c0cf595654a35f9dc47d82809c2268d +Author: Johnny Willemsen +Date: Fri Jan 13 09:58:03 2023 +0100 + + More Windows CE cleanup + +commit 378fbc350bc7d7d940523ac194b646e94caf312d +Author: Johnny Willemsen +Date: Fri Jan 13 09:41:15 2023 +0100 + + Removed Windows CE support + +commit cc5865a958281cb7706a1421a4b96d3becd39c93 +Author: Johnny Willemsen +Date: Thu Jan 12 11:46:29 2023 +0100 + + Upgrade doxygen configuration files to latest doxygen release + +commit 6d4a282d86f0145004ac0cab58371d261abca19b +Author: Johnny Willemsen +Date: Thu Jan 12 11:43:53 2023 +0100 + + Make use of nullptr and delete + + * ACE/ace/ace_wchar.h: + * ACE/ace/ace_wchar.inl: + +commit 6c8071c2b785655696c93a71b9a240705508026f +Author: Johnny Willemsen +Date: Mon Jan 9 16:43:26 2023 +0100 + + Updated OpenDDS url + + * ACE/docs/bczar/bczar.html: + +commit 36c558c30b842c6b6f70b62a8736c35077b2f093 +Author: Chad Elliott +Date: Thu Jan 5 09:55:27 2023 -0600 + + Adds the ability to build ACE core libraries, gperf, and possibly others using CMake. + +commit 6756ee16851ac1daa006f1b30b8987bd03a9c42e +Merge: ec326c77c9a 44d0b213860 +Author: Johnny Willemsen +Date: Mon Dec 19 12:19:34 2022 +0100 + + Merge pull request #2005 from jwillemsen/jwi-x711 + + Make ACE 7.0.11 and TAO 3.0.11 public available + +commit 44d0b213860be8801160f0519c77b648a0316033 +Author: Johnny Willemsen +Date: Mon Dec 19 12:18:46 2022 +0100 + + Make ACE 7.0.11 and TAO 3.0.11 public available + + * ACE/NEWS: + * ACE/bin/copy-local-script.sh: + * ACE/bin/diff-builds-and-group-fixed-tests-only.sh: + * ACE/docs/Download.html: + * ACE/etc/index.html: + * TAO/NEWS: diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM index a42decdf7d1..8afc475100e 100644 --- a/ACE/PROBLEM-REPORT-FORM +++ b/ACE/PROBLEM-REPORT-FORM @@ -25,7 +25,7 @@ include an entire platform-specific configuration file in the form. 8<----------8<----------8<----------8<----------8<----------8<----------8<---- - ACE VERSION: 7.0.11 + ACE VERSION: 7.1.0 HOST MACHINE and OPERATING SYSTEM: If on Windows based OS's, which version of WINSOCK do you diff --git a/ACE/VERSION.txt b/ACE/VERSION.txt index bbf4d7d4adb..f3a2b95ce72 100644 --- a/ACE/VERSION.txt +++ b/ACE/VERSION.txt @@ -1,4 +1,4 @@ -This is ACE version 7.0.11, released Mon Dec 19 12:02:50 CET 2022 +This is ACE version 7.1.0, released Fri Mar 03 09:14:01 CET 2023 If you have any problems with or questions about ACE, please open a issue or discussion on the ACE_TAO github project at diff --git a/ACE/ace/Version.h b/ACE/ace/Version.h index 1f8a71d8fb8..59cc14bdfc2 100644 --- a/ACE/ace/Version.h +++ b/ACE/ace/Version.h @@ -3,8 +3,8 @@ // This is file was automatically generated by $ACE_ROOT/bin/make_release.py #define ACE_MAJOR_VERSION 7 -#define ACE_MINOR_VERSION 0 -#define ACE_MICRO_VERSION 11 -#define ACE_VERSION "7.0.11" -#define ACE_VERSION_CODE 0x7000b +#define ACE_MINOR_VERSION 1 +#define ACE_MICRO_VERSION 0 +#define ACE_VERSION "7.1.0" +#define ACE_VERSION_CODE 0x70100 #define ACE_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c)) diff --git a/ACE/debian/control b/ACE/debian/control index 3bbdc4b43e6..04828b116d5 100644 --- a/ACE/debian/control +++ b/ACE/debian/control @@ -27,7 +27,7 @@ Description: makefile, project, and workspace creator * mpc-ace: generates project files for a single target * mwc-ace: generates workspace files for a set of projects -Package: libace-7.0.11 +Package: libace-7.1.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -45,7 +45,7 @@ Description: C++ network programming framework Package: libace-dev Architecture: any Section: libdevel -Depends: libace-7.0.11 (= ${binary:Version}), ${misc:Depends} +Depends: libace-7.1.0 (= ${binary:Version}), ${misc:Depends} Suggests: libace-doc, pkg-config Replaces: mpc-ace (<< 5.6.3-4) Description: C++ network programming framework - development files @@ -62,7 +62,7 @@ Description: C++ network programming framework - documentation This package contains the ACE overview documentation, tutorials, examples, and information regarding upstream development. -Package: libace-ssl-7.0.11 +Package: libace-ssl-7.1.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -73,12 +73,12 @@ Description: ACE secure socket layer library Package: libace-ssl-dev Architecture: any Section: libdevel -Depends: libace-ssl-7.0.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends} +Depends: libace-ssl-7.1.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends} Description: ACE secure socket layer library - development files This package contains the header files and static library for the ACE SSL library. -Package: libace-rmcast-7.0.11 +Package: libace-rmcast-7.1.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -92,12 +92,12 @@ Description: ACE reliable multicast library Package: libace-rmcast-dev Architecture: any Section: libdevel -Depends: libace-rmcast-7.0.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-rmcast-7.1.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE reliable multicast library - development files This package contains the header files and static library for the ACE reliable multicast library. -Package: libace-tmcast-7.0.11 +Package: libace-tmcast-7.1.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -111,12 +111,12 @@ Description: ACE transactional multicast library Package: libace-tmcast-dev Architecture: any Section: libdevel -Depends: libace-tmcast-7.0.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-tmcast-7.1.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE transactional multicast library - development files This package contains the header files and static library for the ACE transactional multicast library. -Package: libace-htbp-7.0.11 +Package: libace-htbp-7.1.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -130,12 +130,12 @@ Description: ACE protocol over HTTP tunneling library Package: libace-htbp-dev Architecture: any Section: libdevel -Depends: libace-htbp-7.0.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-htbp-7.1.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE protocol over HTTP tunneling library - development files This package contains the header files and static library for the ACE HTBP library. -Package: libace-inet-7.0.11 +Package: libace-inet-7.1.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -146,15 +146,15 @@ Description: ACE Inet protocol library Package: libace-inet-dev Architecture: any Section: libdevel -Depends: libace-inet-7.0.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-inet-7.1.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE Inet protocol library - development files This package contains the header files and static library for the ACE Inet protocol library. -Package: libace-inet-ssl-7.0.11 +Package: libace-inet-ssl-7.1.0 Architecture: any Section: libs -Depends: libace-inet-7.0.11, libace-ssl-7.0.11, ${shlibs:Depends}, ${misc:Depends} +Depends: libace-inet-7.1.0, libace-ssl-7.1.0, ${shlibs:Depends}, ${misc:Depends} Description: ACE SSL-enabled Inet protocol library This package provides an ACE addon library for clients (and possibly servers at some point) using Inet protocols which support SSL, such as @@ -163,7 +163,7 @@ Description: ACE SSL-enabled Inet protocol library Package: libace-inet-ssl-dev Architecture: any Section: libdevel -Depends: libace-inet-ssl-7.0.11 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-inet-ssl-7.1.0 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends} Description: ACE SSL-enabled Inet protocol library - development files This package contains the header files and static library for the ACE SSL-enabled Inet protocol library. @@ -180,7 +180,7 @@ Description: ACE perfect hash function generator basically the same options and functionality. ace_gperf simply takes advantage of some of the features provided by the ACE library. -Package: libacexml-7.0.11 +Package: libacexml-7.1.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -196,12 +196,12 @@ Package: libacexml-dev Architecture: any Section: libdevel Replaces: libace-dev (<< 5.7.7-4) -Depends: libacexml-7.0.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libacexml-7.1.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE SAX based XML parsing library - development files This package contains the header files and static library for the ACE XML parsing library. -Package: libace-xml-utils-7.0.11 +Package: libace-xml-utils-7.1.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -215,12 +215,12 @@ Package: libace-xml-utils-dev Architecture: any Section: libdevel Replaces: libace-dev (<< 5.7.7-4) -Depends: libace-xml-utils-7.0.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev +Depends: libace-xml-utils-7.1.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev Description: ACE XML utility classes and methods - development files This package contains the header files and static library for the ACE XML Utils library -Package: libkokyu-7.0.11 +Package: libkokyu-7.1.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -234,12 +234,12 @@ Description: ACE scheduling and dispatching library Package: libkokyu-dev Architecture: any Section: libdevel -Depends: libkokyu-7.0.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libkokyu-7.1.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE scheduling and dispatching library - development files This package contains the header files and static library for the ACE scheduling and dispatching library. -Package: libace-xtreactor-7.0.11 +Package: libace-xtreactor-7.1.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -257,12 +257,12 @@ Description: ACE-GUI reactor integration for Xt Package: libace-xtreactor-dev Architecture: any Section: libdevel -Depends: libace-xtreactor-7.0.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends} +Depends: libace-xtreactor-7.1.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends} Description: ACE-GUI reactor integration for Xt - development files This package contains header files and static library for the ACE-Xt reactor integration. -Package: libace-tkreactor-7.0.11 +Package: libace-tkreactor-7.1.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -281,12 +281,12 @@ Description: ACE-GUI reactor integration for Tk Package: libace-tkreactor-dev Architecture: any Section: libdevel -Depends: libace-tkreactor-7.0.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends} +Depends: libace-tkreactor-7.1.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends} Description: ACE-GUI reactor integration for Tk - development files This package contains header files and static library for the ACE-Tk reactor integration. -Package: libace-flreactor-7.0.11 +Package: libace-flreactor-7.1.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -304,12 +304,12 @@ Description: ACE-GUI reactor integration for FLTK Package: libace-flreactor-dev Architecture: any Section: libdevel -Depends: libace-flreactor-7.0.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.3-dev, ${misc:Depends} +Depends: libace-flreactor-7.1.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.3-dev, ${misc:Depends} Description: ACE-GUI reactor integration for FLTK - development files This package contains header files and static library for the ACE-FLTK reactor integration. -Package: libace-foxreactor-7.0.11 +Package: libace-foxreactor-7.1.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -326,7 +326,7 @@ Description: ACE-GUI reactor integration for FOX Package: libace-foxreactor-dev Architecture: any Section: libdevel -Depends: libace-foxreactor-7.0.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends} +Depends: libace-foxreactor-7.1.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends} Description: ACE-GUI reactor integration for FOX - development files This package contains header files and static library for the ACE-FOX reactor integration. @@ -343,7 +343,7 @@ Description: ACE network service implementations files to link the various ACE network services together, either statically or dynamically, and form complete server programs. -Package: libnetsvcs-7.0.11 +Package: libnetsvcs-7.1.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -357,7 +357,7 @@ Description: ACE network service implementations - libraries Package: libnetsvcs-dev Architecture: any Section: libdevel -Depends: libnetsvcs-7.0.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libnetsvcs-7.1.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE network service implementations - development files ACE network services provide reusable components for common distributed system tasks such as logging, naming, locking, and time diff --git a/ACE/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec index 7168e8acf84..fdcdbb4491d 100644 --- a/ACE/rpmbuild/ace-tao.spec +++ b/ACE/rpmbuild/ace-tao.spec @@ -1,6 +1,6 @@ # Set the version number here. -%define ACEVER 7.0.11 -%define TAOVER 3.0.11 +%define ACEVER 7.1.0 +%define TAOVER 3.1.0 # Conditional build # Default values are diff --git a/TAO/ChangeLogs/TAO-3_1_0 b/TAO/ChangeLogs/TAO-3_1_0 new file mode 100644 index 00000000000..e526bfedc73 --- /dev/null +++ b/TAO/ChangeLogs/TAO-3_1_0 @@ -0,0 +1,393 @@ +commit cfc83e2d8bfa83ba08452767d8ab943f539e3ae8 +Author: Johnny Willemsen +Date: Tue Feb 21 13:28:15 2023 +0100 + + Make use of std::make_unique + + * TAO/tao/PortableServer/Active_Policy_Strategies.cpp: + +commit 5df6c5248e1c1be3aeaefa10ff9eb9be593ec2fd +Author: Johnny Willemsen +Date: Mon Feb 13 17:04:40 2023 +0100 + + Reduced usage of static as we do in generated code + + * TAO/tao/PortableServer/Servant_Base.cpp: + +commit 94392eaddf51af04621f46337b392c688171434f +Author: Johnny Willemsen +Date: Mon Feb 13 16:51:27 2023 +0100 + + Use constexpr + + * TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp: + * TAO/tao/Codeset/UTF16_BOM_Translator.cpp: + * TAO/tao/GIOP_Message_Generator_Parser_12.cpp: + +commit d2b7bf891f0b11840b5528b89cac105daef04f33 +Author: Johnny Willemsen +Date: Mon Feb 13 16:51:14 2023 +0100 + + Revert default + + * TAO/tao/Argument.cpp: + * TAO/tao/Argument.h: + +commit 80ef4188441e6a0b786e48659af9e39ecd4b9735 +Author: Johnny Willemsen +Date: Mon Feb 13 16:38:30 2023 +0100 + + Use default destructor + + * TAO/tao/Argument.cpp: + * TAO/tao/Argument.h: + * TAO/tao/Base_Transport_Property.cpp: + * TAO/tao/Base_Transport_Property.h: + +commit 45fa63be04357683ab473a2f993e621508ecb5f7 +Author: Johnny Willemsen +Date: Mon Feb 13 16:29:08 2023 +0100 + + Fixed warnings + + * TAO/tao/PortableServer/IdAssignmentPolicy.h: + * TAO/tao/PortableServer/IdUniquenessPolicy.h: + * TAO/tao/PortableServer/LifespanStrategyPersistent.h: + * TAO/tao/PortableServer/LifespanStrategyTransient.h: + * TAO/tao/PortableServer/Operation_Table_Linear_Search.h: + * TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h: + * TAO/tao/PortableServer/ServantRetentionStrategyRetain.h: + * TAO/tao/RTPortableServer/RT_POA.h: + * TAO/tao/RTPortableServer/RT_Policy_Validator.h: + +commit 88ce4a3384ee967a8007a3575bfca9d2dde0dc7a +Author: Johnny Willemsen +Date: Mon Feb 13 16:23:46 2023 +0100 + + Replace enum with static constexpr + + * TAO/tao/PortableServer/Root_POA.h: + +commit d9b768c3239be29c3219f2fca81b39e2dc8787b1 +Author: Johnny Willemsen +Date: Mon Feb 13 15:29:08 2023 +0100 + + the_children is not available in all CORBA profiles + + * TAO/tao/PortableServer/Root_POA.cpp: + * TAO/tao/PortableServer/Root_POA.h: + * TAO/tao/RTPortableServer/RT_POA.cpp: + * TAO/tao/RTPortableServer/RT_POA.h: + +commit 53cabe442f3b082ee21458dfa2095fd0b5b0ba6b +Author: Johnny Willemsen +Date: Mon Feb 13 14:33:33 2023 +0100 + + Use default + + * TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp: + * TAO/tao/PortableServer/Default_Acceptor_Filter.cpp: + * TAO/tao/PortableServer/Default_Acceptor_Filter.h: + +commit 48b96dee6147efa609f1536296929489203f3193 +Author: Johnny Willemsen +Date: Mon Feb 13 14:16:16 2023 +0100 + + Another default destructor + + * TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp: + * TAO/tao/PortableServer/Acceptor_Filter_Factory.h: + +commit 8c215112dfc278f704ba37db8699a829f9cabf3a +Author: Johnny Willemsen +Date: Mon Feb 13 14:13:15 2023 +0100 + + Compile fixes + + * TAO/tao/PortableServer/Active_Policy_Strategies.h: + * TAO/tao/PortableServer/ThreadStrategy.h: + +commit 5a66fa9c3a3c1d265808ee2049dabaef4bf1a3db +Author: Johnny Willemsen +Date: Mon Feb 13 14:01:06 2023 +0100 + + Check for nil pointers in cleanup + + * TAO/tao/PortableServer/Active_Policy_Strategies.cpp: + +commit c35277837fe52adb19a22a9d18931b3e804b8358 +Author: Johnny Willemsen +Date: Mon Feb 13 12:43:48 2023 +0100 + + Use override/default for RTPortableServer + + * TAO/NEWS: + * TAO/tao/RTPortableServer/RT_Acceptor_Filters.h: + * TAO/tao/RTPortableServer/RT_Collocation_Resolver.h: + * TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.h: + * TAO/tao/RTPortableServer/RT_POA.cpp: + * TAO/tao/RTPortableServer/RT_POA.h: + * TAO/tao/RTPortableServer/RT_Policy_Validator.h: + * TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp: + * TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h: + +commit 4db6c4351dfd785f59a9b16122e52eeec44520c0 +Author: Johnny Willemsen +Date: Mon Feb 13 12:30:59 2023 +0100 + + Fixed unresolved exports, more override + + * ACE/protocols/ace/HTBP/HTBP_Addr.cpp: + * ACE/protocols/ace/HTBP/HTBP_Addr.h: + * TAO/tao/PortableServer/Active_Object_Map.cpp: + * TAO/tao/PortableServer/Active_Object_Map.h: + * TAO/tao/PortableServer/Active_Policy_Strategies.h: + * TAO/tao/PortableServer/Active_Policy_Strategies.inl: + * TAO/tao/PortableServer/IdUniquenessStrategy.h: + * TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp: + * TAO/tao/PortableServer/Operation_Table_Binary_Search.h: + * TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h: + * TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp: + * TAO/tao/PortableServer/Operation_Table_Linear_Search.h: + * TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp: + * TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h: + * TAO/tao/PortableServer/POA_Current_Factory.cpp: + * TAO/tao/PortableServer/POA_Current_Impl.cpp: + * TAO/tao/PortableServer/POA_Current_Impl.h: + * TAO/tao/PortableServer/POA_Policy_Set.h: + * TAO/tao/PortableServer/ServantRetentionStrategy.h: + +commit 322d0a3e30d2e608108e0d7caf6bdcddbd728081 +Author: Johnny Willemsen +Date: Mon Feb 13 11:42:23 2023 +0100 + + Major cleanup in PortableServer library + +commit 69fbec6c475060cf01a710a3d7ed6e756538858c +Merge: 7e8b94b728b 89a05c65fd6 +Author: Johnny Willemsen +Date: Mon Feb 6 09:21:37 2023 +0100 + + Merge pull request #2046 from jwillemsen/jwinullptrexce + + Use nullptr and make destructor of TAO SystemException default + +commit 716ee59f4081486404adae50f46172a39518e619 +Author: Johnny Willemsen +Date: Fri Feb 3 19:49:42 2023 +0100 + + Make destructor default + + * TAO/tao/SystemException.cpp: + * TAO/tao/SystemException.h: + +commit 7e8b94b728b886d14fc17b6af789e9ba0c50a050 +Merge: 4961b8026b5 ec19b2725b5 +Author: Johnny Willemsen +Date: Thu Feb 2 09:13:03 2023 +0100 + + Merge pull request #2042 from jwillemsen/jwi-cleanupmacros + + Cleanup unused macros + +commit 757fd0a5eef53e1c9e1a8327eb5d4b34e81d7cb9 +Merge: 107d2bfea7c 7f4365e6544 +Author: Johnny Willemsen +Date: Thu Feb 2 09:09:17 2023 +0100 + + Merge pull request #2043 from jwillemsen/jwi-pharlapcleanup + + Removed pharlap support + +commit ec19b2725b53eba54c4ba434d371ae569832f762 +Author: Johnny Willemsen +Date: Wed Feb 1 18:15:12 2023 +0100 + + Removed include + + * TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp: + +commit c67f33599590cf2e229da6a141fef90d0af6f034 +Author: Johnny Willemsen +Date: Wed Feb 1 15:57:28 2023 +0100 + + Remove includes + + * TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp: + +commit 6198126ce20cc418252f461621c81d19ee2b36e4 +Author: Johnny Willemsen +Date: Wed Feb 1 15:44:33 2023 +0100 + + Removed pharlap support + +commit c3e71f69e85deb48d5f3cdba355679da4deffdb3 +Author: Johnny Willemsen +Date: Wed Feb 1 10:51:23 2023 +0100 + + good_bit is a bool and removed some uncessary c-style casts + +commit e5391a0076f5e370f929b111a8a6ed52ee4cb5da +Author: Johnny Willemsen +Date: Tue Jan 17 12:32:56 2023 +0100 + + More Sun OS/compiler cleanup + +commit 73bdf800479e53a11143735e48348bb88c527c24 +Author: Johnny Willemsen +Date: Tue Jan 17 09:44:30 2023 +0100 + + Cleanup Solaris support + +commit dcb4692364d4a9175db59b9280dbbd54524bb3ce +Author: Johnny Willemsen +Date: Mon Jan 16 16:45:00 2023 +0100 + + Removed checks for ACE_TEMPLATES_REQUIRE_SOURCE + +commit f25410e018ff6b65ec24df5ba249447f74eb0198 +Author: Johnny Willemsen +Date: Mon Jan 16 15:47:01 2023 +0100 + + Removed AIX support + +commit d645bf461a41039dda402e1674ed7a6d40620957 +Merge: c9c577ffbe6 098b5aa5257 +Author: Johnny Willemsen +Date: Sun Jan 15 16:14:12 2023 +0100 + + Merge pull request #2028 from jwillemsen/jwi-removehpux + + Remove HPUX support + +commit c9c577ffbe64efca48e6a05add0e0070add7da6d +Merge: 6f36dbed40c 0a572bec884 +Author: Johnny Willemsen +Date: Sun Jan 15 14:04:11 2023 +0100 + + Merge pull request #2027 from jwillemsen/jwi-openvmscleanup + + Removed some OpenVMS code + +commit b5aeaf20ef9d15d09acb52b4c8ac77762937ae26 +Author: Johnny Willemsen +Date: Sun Jan 15 12:28:28 2023 +0100 + + More cleanup + + * ACE/ace/config-linux-common.h: + * ACE/ace/config-macros.h: + * TAO/TAO_IDL/fe/idl.yy.cpp: + +commit f865e5929c4668611213fc1ee677ef47ad0f6482 +Author: Johnny Willemsen +Date: Sun Jan 15 12:26:51 2023 +0100 + + Removed HPUX support + +commit da66efe89c66a7997f6728759c196643c3910018 +Author: Johnny Willemsen +Date: Sun Jan 15 11:02:36 2023 +0100 + + Updated NEWS files + +commit b30753f1a1b18c831e89223ec01db66231b5a64a +Author: Johnny Willemsen +Date: Sun Jan 15 11:01:49 2023 +0100 + + Removed HPUX support + +commit 0a572bec8848eabb70c652fffa043ec335f45454 +Author: Johnny Willemsen +Date: Sun Jan 15 10:34:15 2023 +0100 + + Removed some OpenVMS code + + * ACE/ace/SSL/SSL_Context.cpp: + * ACE/ace/Sock_Connect.cpp: + * TAO/TAO-INSTALL.html: + +commit f790b484f95da51afd080f5cc73209c086476ad2 +Author: Oliver Kellogg +Date: Sat Jan 14 23:33:27 2023 +0100 + + Address issue #2015 : In TAO/TAO_IDL/ast/ast_field.cpp constructor handle AST_Decl::NT_except. + +commit 2916b2fa78bc0fdcae44b590af9543245d481e15 +Author: Johnny Willemsen +Date: Sat Jan 14 10:09:54 2023 +0100 + + Removed OpenVMS support + +commit 20da1c5dcbed95befc08ccf258f62c91a16762f4 +Merge: 158938dceab cc5865a9582 +Author: Johnny Willemsen +Date: Sat Jan 14 09:53:44 2023 +0100 + + Merge pull request #2014 from jwillemsen/jwi-doxygen196 + + Upgrade doxygen configuration files to latest doxygen release + +commit def8e4413d0d9c8ac4e3da85d0e9578594996992 +Author: Johnny Willemsen +Date: Fri Jan 13 21:23:59 2023 +0100 + + Update Hash_Naming_Context.h + +commit 975c3a5bf969f623848919f5b2f085da87fecf70 +Author: Johnny Willemsen +Date: Fri Jan 13 20:23:28 2023 +0100 + + Update Hash_Naming_Context.h + +commit 8f0f05f51c0cf595654a35f9dc47d82809c2268d +Author: Johnny Willemsen +Date: Fri Jan 13 09:58:03 2023 +0100 + + More Windows CE cleanup + +commit 378fbc350bc7d7d940523ac194b646e94caf312d +Author: Johnny Willemsen +Date: Fri Jan 13 09:41:15 2023 +0100 + + Removed Windows CE support + +commit cc5865a958281cb7706a1421a4b96d3becd39c93 +Author: Johnny Willemsen +Date: Thu Jan 12 11:46:29 2023 +0100 + + Upgrade doxygen configuration files to latest doxygen release + +commit 309f09e15602b400dcf1947422b4029bd32a5b03 +Author: Chad Elliott +Date: Fri Jan 6 07:07:54 2023 -0600 + + Removed unnecessary includes and added necessary ones. + +commit d613e17b4531f57bc51a7075588daddf9514a2ac +Author: Chad Elliott +Date: Fri Nov 18 11:34:22 2022 -0600 + + Corrected #include's + +commit 6756ee16851ac1daa006f1b30b8987bd03a9c42e +Merge: ec326c77c9a 44d0b213860 +Author: Johnny Willemsen +Date: Mon Dec 19 12:19:34 2022 +0100 + + Merge pull request #2005 from jwillemsen/jwi-x711 + + Make ACE 7.0.11 and TAO 3.0.11 public available + +commit 44d0b213860be8801160f0519c77b648a0316033 +Author: Johnny Willemsen +Date: Mon Dec 19 12:18:46 2022 +0100 + + Make ACE 7.0.11 and TAO 3.0.11 public available + + * ACE/NEWS: + * ACE/bin/copy-local-script.sh: + * ACE/bin/diff-builds-and-group-fixed-tests-only.sh: + * ACE/docs/Download.html: + * ACE/etc/index.html: + * TAO/NEWS: diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM index 1b7187562fc..9ed630e1ac1 100644 --- a/TAO/PROBLEM-REPORT-FORM +++ b/TAO/PROBLEM-REPORT-FORM @@ -40,8 +40,8 @@ To: tao-bugs@list.isis.vanderbilt.edu Subject: [area]: [synopsis] - TAO VERSION: 3.0.11 - ACE VERSION: 7.0.11 + TAO VERSION: 3.1.0 + ACE VERSION: 7.1.0 HOST MACHINE and OPERATING SYSTEM: If on Windows based OS's, which version of WINSOCK do you diff --git a/TAO/VERSION.txt b/TAO/VERSION.txt index 0ad10a9efb1..c76a2bc2d6b 100644 --- a/TAO/VERSION.txt +++ b/TAO/VERSION.txt @@ -1,4 +1,4 @@ -This is TAO version 3.0.11, released Mon Dec 19 12:02:50 CET 2022 +This is TAO version 3.1.0, released Fri Mar 03 09:14:01 CET 2023 If you have any problems with or questions about TAO, please open a issue or discussion on the ACE_TAO github project at diff --git a/TAO/tao/Version.h b/TAO/tao/Version.h index 0f0535a9772..6a79f24d0eb 100644 --- a/TAO/tao/Version.h +++ b/TAO/tao/Version.h @@ -3,8 +3,8 @@ // This is file was automatically generated by $ACE_ROOT/bin/make_release.py #define TAO_MAJOR_VERSION 3 -#define TAO_MINOR_VERSION 0 -#define TAO_MICRO_VERSION 11 -#define TAO_VERSION "3.0.11" -#define TAO_VERSION_CODE 0x3000b +#define TAO_MINOR_VERSION 1 +#define TAO_MICRO_VERSION 0 +#define TAO_VERSION "3.1.0" +#define TAO_VERSION_CODE 0x30100 #define TAO_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c)) -- cgit v1.2.1 From ed1a2e35ca124c5697f32527ad286e22e9f5877b Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 3 Mar 2023 09:38:39 +0100 Subject: Make ACE 7.1.0 and TAO 3.1.0 public available * ACE/NEWS: * ACE/bin/copy-local-script.sh: * ACE/bin/diff-builds-and-group-fixed-tests-only.sh: * ACE/docs/Download.html: * ACE/etc/index.html: --- ACE/NEWS | 3 + ACE/bin/copy-local-script.sh | 2 +- ACE/bin/diff-builds-and-group-fixed-tests-only.sh | 2 +- ACE/docs/Download.html | 146 +++++++++++----------- ACE/etc/index.html | 1 + 5 files changed, 79 insertions(+), 75 deletions(-) diff --git a/ACE/NEWS b/ACE/NEWS index bb38cc3b52f..f4fcdd4e11c 100644 --- a/ACE/NEWS +++ b/ACE/NEWS @@ -1,3 +1,6 @@ +USER VISIBLE CHANGES BETWEEN ACE-7.1.0 and ACE-7.1.1 +==================================================== + USER VISIBLE CHANGES BETWEEN ACE-7.0.11 and ACE-7.1.0 ===================================================== diff --git a/ACE/bin/copy-local-script.sh b/ACE/bin/copy-local-script.sh index d2d00615482..1f78db60bab 100755 --- a/ACE/bin/copy-local-script.sh +++ b/ACE/bin/copy-local-script.sh @@ -1,7 +1,7 @@ #!/bin/sh for i in *.gz *.bz2 *.zip *.md5; do - d=`echo $i | sed 's/\.[tz][ai][rp]/-7.0.12&/'` + d=`echo $i | sed 's/\.[tz][ai][rp]/-7.1.1&/'` echo "Copying $i to $d" cp -ip $i $d done diff --git a/ACE/bin/diff-builds-and-group-fixed-tests-only.sh b/ACE/bin/diff-builds-and-group-fixed-tests-only.sh index f309efdc3e0..c0ea5f72290 100755 --- a/ACE/bin/diff-builds-and-group-fixed-tests-only.sh +++ b/ACE/bin/diff-builds-and-group-fixed-tests-only.sh @@ -2,7 +2,7 @@ if test -z $1; then newdate=`date -u +%Y_%m_%d`; else newdate=$1; fi if test -z $2; then prefix=`date -u +%Y%m%d%a`; else prefix=$2; fi -if test -z $3; then olddate=2022_12_19; else olddate=$3; fi +if test -z $3; then olddate=2023_03_03; else olddate=$3; fi if test -z $ACE_ROOT; then ACE_ROOT=..; fi if test -z $TAO_ROOT; then TAO_ROOT=${ACE_ROOT}/TAO; fi # diff --git a/ACE/docs/Download.html b/ACE/docs/Download.html index b9ec2ae919a..f6f2249e235 100644 --- a/ACE/docs/Download.html +++ b/ACE/docs/Download.html @@ -90,160 +90,160 @@ Windows line feeds. For all other platforms download a .gz/.bz2 package.

    -
  • Latest ACE+TAO Micro Release. The latest micro release is ACE 7.0.11 and TAO 3.0.11 -(ACE+TAO x.0.11), please use the links below to download it.

    +

  • Latest ACE+TAO Micro Release. The latest micro release is ACE 7.1.0 and TAO 3.1.0 +(ACE+TAO x.1.0), please use the links below to download it.

    - - - - - - - - - - - - - - -
    FilenameDescriptionFullSources only
    ACE+TAO.tar.gz ACE+TAO (tar+gzip format)[HTTP] - [FTP] + [HTTP] + [FTP] [HTTP] - [FTP] + [HTTP] + [FTP]
    ACE+TAO.tar.bz2 ACE+TAO (tar+bzip2 format)[HTTP] - [FTP] + [HTTP] + [FTP] [HTTP] - [FTP] + [HTTP] + [FTP]
    ACE+TAO.zip ACE+TAO (zip format)[HTTP] - [FTP] + [HTTP] + [FTP] [HTTP] - [FTP] + [HTTP] + [FTP]
    ACE-html.tar.gz Doxygen documentation for ACE+TAO (tar+gzip format)[HTTP] - [FTP] + [HTTP] + [FTP]
    ACE-html.tar.bz2 Doxygen documentation for ACE+TAO (tar+bzip2 format)[HTTP] - [FTP] + [HTTP] + [FTP]
    ACE-html.zip Doxygen documentation for ACE+TAO (zip format)[HTTP] - [FTP] + [HTTP] + [FTP]
    ACE.tar.gz ACE only (tar+gzip format)[HTTP] - [FTP] + [HTTP] + [FTP] [HTTP] - [FTP] + [HTTP] + [FTP]
    ACE.tar.bz2 ACE only (tar+bzip2 format)[HTTP] - [FTP] + [HTTP] + [FTP] [HTTP] - [FTP] + [HTTP] + [FTP]
    ACE.zip ACE only (zip format)[HTTP] - [FTP] + [HTTP] + [FTP] [HTTP] - [FTP] + [HTTP] + [FTP]
    -

  • Latest ACE+TAO Minor Release. The latest minor release is ACE 7.0.0 and TAO 3.0.0 -(ACE+TAO x.0.0), please use the links below to download it.

    +

  • Latest ACE+TAO Minor Release. The latest minor release is ACE 7.1.0 and TAO 3.1.0 +(ACE+TAO x.1.0), please use the links below to download it.

    - + - - - + - - - + - - - + - - + - - + - - + - - - + - - - + - -
    FilenameDescriptionFullSources only
    ACE+TAO-7.0.0.tar.gz
    ACE+TAO-7.1.0.tar.gz ACE+TAO (tar+gzip format)[HTTP] - [FTP] + [HTTP] + [FTP] [HTTP] - [FTP] + [HTTP] + [FTP]
    ACE+TAO-7.0.0.tar.bz2
    ACE+TAO-7.1.0.tar.bz2 ACE+TAO (tar+bzip2 format)[HTTP] - [FTP] + [HTTP] + [FTP] [HTTP] - [FTP] + [HTTP] + [FTP]
    ACE+TAO-7.0.0.zip
    ACE+TAO-7.1.0.zip ACE+TAO (zip format)[HTTP] - [FTP] + [HTTP] + [FTP] [HTTP] - [FTP] + [HTTP] + [FTP]
    ACE-html-7.0.0.tar.gz
    ACE-html-7.1.0.tar.gz Doxygen documentation for ACE+TAO (tar+gzip format)[HTTP] - [FTP] + [HTTP] + [FTP]
    ACE-html-7.0.0.tar.bz2
    ACE-html-7.1.0.tar.bz2 Doxygen documentation for ACE+TAO (tar+bzip2 format)[HTTP] - [FTP] + [HTTP] + [FTP]
    ACE-html-7.0.0.zip
    ACE-html-7.1.0.zip Doxygen documentation for ACE+TAO (zip format)[HTTP] - [FTP] + [HTTP] + [FTP]
    ACE-7.0.0.tar.gz
    ACE-7.1.0.tar.gz ACE only (tar+gzip format)[HTTP] - [FTP] + [HTTP] + [FTP] [HTTP] - [FTP] + [HTTP] + [FTP]
    ACE-7.0.0.tar.bz2
    ACE-7.1.0.tar.bz2 ACE only (tar+bzip2 format)[HTTP] - [FTP] + [HTTP] + [FTP] [HTTP] - [FTP] + [HTTP] + [FTP]
    ACE-7.0.0.zip
    ACE-7.1.0.zip ACE only (zip format)[HTTP] - [FTP] + [HTTP] + [FTP] [HTTP] - [FTP] + [HTTP] + [FTP]
    diff --git a/ACE/etc/index.html b/ACE/etc/index.html index 8af2badef55..6cd8ffd21c4 100644 --- a/ACE/etc/index.html +++ b/ACE/etc/index.html @@ -30,6 +30,7 @@

    We do have the documentation for previous releases
      +

    • 7.1.0

    • 7.0.11

    • 7.0.10

    • 7.0.9

      • -- cgit v1.2.1 From a1480384cc3233889d1f043fcd428c627843d272 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 3 Mar 2023 11:05:30 +0100 Subject: Add space to resolve compiler warnings on condaforge * ACE/ace/OS_NS_Thread.inl: * ACE/ace/OS_NS_unistd.inl: --- ACE/ace/OS_NS_Thread.inl | 2 +- ACE/ace/OS_NS_unistd.inl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ACE/ace/OS_NS_Thread.inl b/ACE/ace/OS_NS_Thread.inl index 17335f782c5..e20c7077f88 100644 --- a/ACE/ace/OS_NS_Thread.inl +++ b/ACE/ace/OS_NS_Thread.inl @@ -534,7 +534,7 @@ ACE_OS::event_init (ACE_event_t *event, #endif /* ACE_HAS_WCHAR */ ACE_INLINE long -ACE_OS::priority_control (ACE_idtype_t /*idtype*/, ACE_id_t /*identifier*/, int /*cmd*/, void */*arg*/) +ACE_OS::priority_control (ACE_idtype_t /*idtype*/, ACE_id_t /*identifier*/, int /*cmd*/, void * /*arg*/) { ACE_OS_TRACE ("ACE_OS::priority_control"); ACE_NOTSUP_RETURN (-1); diff --git a/ACE/ace/OS_NS_unistd.inl b/ACE/ace/OS_NS_unistd.inl index 455192e4ee0..83f77073575 100644 --- a/ACE/ace/OS_NS_unistd.inl +++ b/ACE/ace/OS_NS_unistd.inl @@ -1019,7 +1019,7 @@ ACE_OS::sysconf (int name) } ACE_INLINE long -ACE_OS::sysinfo (int /*cmd*/, char */*buf*/, long /*count*/) +ACE_OS::sysinfo (int /*cmd*/, char * /*buf*/, long /*count*/) { ACE_OS_TRACE ("ACE_OS::sysinfo"); ACE_NOTSUP_RETURN (0); -- cgit v1.2.1 From 5f7f5729b3123c2f1c2874c6d560fba46a1749f1 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 3 Mar 2023 16:12:20 +0100 Subject: Prepare news file for next release * TAO/NEWS: --- TAO/NEWS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/TAO/NEWS b/TAO/NEWS index 23f0ed8a665..0039fcf71b6 100644 --- a/TAO/NEWS +++ b/TAO/NEWS @@ -1,3 +1,6 @@ +USER VISIBLE CHANGES BETWEEN TAO-3.1.0 and TAO-3.1.1 +==================================================== + USER VISIBLE CHANGES BETWEEN TAO-3.0.11 and TAO-3.1.0 ===================================================== -- cgit v1.2.1 From 1ceebf2e295dfd342b8d9e725057350c894e230d Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 13 Mar 2023 10:46:59 +0100 Subject: Removed deprecated -ORBResources * TAO/orbsvcs/tests/AVStreams/Multicast/components_svc.conf: * TAO/tao/ORB_Core.cpp: --- TAO/orbsvcs/tests/AVStreams/Multicast/components_svc.conf | 2 +- TAO/tao/ORB_Core.cpp | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/components_svc.conf b/TAO/orbsvcs/tests/AVStreams/Multicast/components_svc.conf index 99f9241e162..534bdceef22 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/components_svc.conf +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/components_svc.conf @@ -1,5 +1,5 @@ # -#static Advanced_Resource_Factory "-ORBresources global -ORBReactorType select_st -ORBInputCDRAllocator null -ORBConnectionCacheLock null" +#static Advanced_Resource_Factory "-ORBReactorType select_st -ORBInputCDRAllocator null -ORBConnectionCacheLock null" #static Server_Strategy_Factory "-ORBAllowReactivationOfSystemids 0" #static Client_Strategy_Factory "-ORBClientConnectionHandler ST" diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index 7da08d0f8cb..a938793e1ee 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -800,15 +800,6 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) else this->orb_params ()->ami_collication (false); - arg_shifter.consume_arg (); - } - else if (nullptr != (current_arg = arg_shifter.get_the_parameter - (ACE_TEXT("-ORBResources")))) - { - TAOLIB_DEBUG ((LM_WARNING, - ACE_TEXT ("\"-ORBResources\" has been ") - ACE_TEXT ("deprecated.\n"))); - arg_shifter.consume_arg (); } else if (nullptr != (current_arg = arg_shifter.get_the_parameter -- cgit v1.2.1 From 71bf5816be5e2a83653887648f9cff03eef0655d Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 13 Mar 2023 10:47:11 +0100 Subject: Removed redundant whitespace * TAO/tao/operation_details.h: --- TAO/tao/operation_details.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TAO/tao/operation_details.h b/TAO/tao/operation_details.h index 53d4e7bf6e8..a7f15528ab7 100644 --- a/TAO/tao/operation_details.h +++ b/TAO/tao/operation_details.h @@ -148,7 +148,7 @@ public: /// Accessors for the argument list TAO::Argument ** args () const; - CORBA::ULong args_num () const ; + CORBA::ULong args_num () const; /// Exception count CORBA::ULong ex_count () const; -- cgit v1.2.1 From 1369b3773ffa4e9b2acdacb68c27050f359f0b8e Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 14 Mar 2023 11:10:20 +0100 Subject: Fixed typo in comment * TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp: --- TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp b/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp index 79ed9106ddf..8b11fede503 100644 --- a/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp +++ b/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp @@ -14,7 +14,7 @@ TAO_AMI_Arguments_Converter_Impl::convert_request ( TAO::Argument * const args[], size_t nargs) { - // The AMI requests on client side just has the in and inout argumenst, + // The AMI requests on client side just has the in and inout arguments, // Since the argument list in the client side is used by server side // in collocation case and the server expects the full list of arguments // and not just the inout arguments we need to expand the client arguments -- cgit v1.2.1 From e1432d22fcf52f941e587e8e8b5f291d5a08ff9c Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 29 Mar 2023 15:55:22 +0200 Subject: Mention that nullptr should be used * ACE/bin/fuzz.pl: --- ACE/bin/fuzz.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ACE/bin/fuzz.pl b/ACE/bin/fuzz.pl index f75c1b6d325..e6b857054b4 100755 --- a/ACE/bin/fuzz.pl +++ b/ACE/bin/fuzz.pl @@ -906,7 +906,7 @@ sub check_for_NULL () } if ($disable == 0) { if(/(\(|\)|\s+|=)NULL(\)|\s+|\;|\,)/ and $` !~ /\/\// and $` !~ /\/\*/ and $` !~ /\*\*+/ and $` !~ /\s+\*+\s+/) { - print_error ("$file:$.: NULL found"); + print_error ("$file:$.: NULL found, use nullptr"); } } } -- cgit v1.2.1 From dcb6eb6b153d2ab82890496fa6446c23bc1b4ccb Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 31 Mar 2023 09:26:57 +0200 Subject: Upgrade to run-vcpkg@v11 * .github/workflows/windows.yml: --- .github/workflows/windows.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index d16e9f2a9bd..2aab7854be1 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -12,7 +12,7 @@ concurrency: cancel-in-progress: true jobs: - msvc: + msvc:lastUpdateReceived strategy: fail-fast: false matrix: @@ -129,9 +129,9 @@ jobs: '{"name": "tao","version-string": "githubaction","dependencies": [ ${{ matrix.vcpkgpackages }} ]}' > vcpkg.json shell: pwsh - name: Install vcpkg - uses: lukka/run-vcpkg@v10 + uses: lukka/run-vcpkg@v11 with: - vcpkgGitCommitId: 94ce0dab56f4d8ba6bd631ba59ed682b02d45c46 + vcpkgGitCommitId: 5b1214315250939257ef5d62ecdcbca18cf4fb1c appendedCacheKey: ${{ matrix.name }} runVcpkgInstall: true - name: create $ACE_ROOT/ace/config.h -- cgit v1.2.1 From 845c9d681ff4bf7f3f6059eb937541fbd68936d0 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 31 Mar 2023 09:32:39 +0200 Subject: Removed incorrect change * .github/workflows/windows.yml: --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 2aab7854be1..40e4182a3d7 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -12,7 +12,7 @@ concurrency: cancel-in-progress: true jobs: - msvc:lastUpdateReceived + msvc: strategy: fail-fast: false matrix: -- cgit v1.2.1 From 0e73d52a4e277537ef3c0401bac30efb602eedc0 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 31 Mar 2023 11:29:25 +0200 Subject: Removed appendedCacheKey, not supported anymore * .github/workflows/windows.yml: --- .github/workflows/windows.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 40e4182a3d7..f0a664761c0 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -132,7 +132,6 @@ jobs: uses: lukka/run-vcpkg@v11 with: vcpkgGitCommitId: 5b1214315250939257ef5d62ecdcbca18cf4fb1c - appendedCacheKey: ${{ matrix.name }} runVcpkgInstall: true - name: create $ACE_ROOT/ace/config.h run: | -- cgit v1.2.1