diff options
Diffstat (limited to 'TAO/tao')
718 files changed, 4992 insertions, 8478 deletions
diff --git a/TAO/tao/Abstract_Servant_Base.cpp b/TAO/tao/Abstract_Servant_Base.cpp index a1605345254..fc917331b46 100644 --- a/TAO/tao/Abstract_Servant_Base.cpp +++ b/TAO/tao/Abstract_Servant_Base.cpp @@ -7,7 +7,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Abstract_ServantBase::~TAO_Abstract_ServantBase (void) +TAO_Abstract_ServantBase::~TAO_Abstract_ServantBase () { } diff --git a/TAO/tao/Abstract_Servant_Base.h b/TAO/tao/Abstract_Servant_Base.h index 2fb670808a4..9b53e14563b 100644 --- a/TAO/tao/Abstract_Servant_Base.h +++ b/TAO/tao/Abstract_Servant_Base.h @@ -70,25 +70,25 @@ class TAO_Export TAO_Abstract_ServantBase { public: /// Destructor - virtual ~TAO_Abstract_ServantBase (void); + virtual ~TAO_Abstract_ServantBase (); /// Local implementation of the CORBA::Object::_is_a method. virtual CORBA::Boolean _is_a (const char* logical_type_id) = 0; #if (TAO_HAS_MINIMUM_CORBA == 0) /// Default @c _non_existent: always returns false. - virtual CORBA::Boolean _non_existent (void) = 0; + virtual CORBA::Boolean _non_existent () = 0; #if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) /// Query the Interface Repository. - virtual CORBA::InterfaceDef_ptr _get_interface (void) = 0; + virtual CORBA::InterfaceDef_ptr _get_interface () = 0; /// Default @c _get_component: always returns nil. - virtual CORBA::Object_ptr _get_component (void) = 0; + virtual CORBA::Object_ptr _get_component () = 0; #endif /// Default @c _repository_id - virtual char * _repository_id (void) = 0; + virtual char * _repository_id () = 0; #endif /* TAO_HAS_MINIMUM_CORBA */ //@{ @@ -96,21 +96,21 @@ public: * @name Reference Counting Operations */ /// Increase reference count by one. - virtual void _add_ref (void) = 0; + virtual void _add_ref () = 0; /** * Decreases reference count by one; if the resulting reference * count equals zero, _remove_ref invokes delete on its this pointer * in order to destroy the servant. */ - virtual void _remove_ref (void) = 0; + virtual void _remove_ref () = 0; /// Returns the current reference count value. - virtual CORBA::ULong _refcount_value (void) const = 0; + virtual CORBA::ULong _refcount_value () const = 0; //@} /// This is an auxiliary method for _this() and _narrow(). - virtual TAO_Stub *_create_stub (void) = 0; + virtual TAO_Stub *_create_stub () = 0; /// Find an operation in the operation table and return a /// TAO_Skeleton which can be used to make upcalls @@ -137,7 +137,7 @@ public: protected: /// Default constructor, only derived classes can be created. - TAO_Abstract_ServantBase (void); + TAO_Abstract_ServantBase (); /// Copy constructor, protected so no instances can be created. TAO_Abstract_ServantBase (const TAO_Abstract_ServantBase &); @@ -157,7 +157,7 @@ protected: TAO::Portable_Server::Servant_Upcall *servant_upcall) = 0; /// Get this interface's repository id (TAO specific). - virtual const char *_interface_repository_id (void) const = 0; + virtual const char *_interface_repository_id () const = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Acceptor_Filter.cpp b/TAO/tao/Acceptor_Filter.cpp index 26a7f1d33d9..6c1fe0bad53 100644 --- a/TAO/tao/Acceptor_Filter.cpp +++ b/TAO/tao/Acceptor_Filter.cpp @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Acceptor_Filter::~TAO_Acceptor_Filter (void) +TAO_Acceptor_Filter::~TAO_Acceptor_Filter () { } diff --git a/TAO/tao/Acceptor_Filter.h b/TAO/tao/Acceptor_Filter.h index d5c4415de3c..1f1f1d095ac 100644 --- a/TAO/tao/Acceptor_Filter.h +++ b/TAO/tao/Acceptor_Filter.h @@ -44,7 +44,7 @@ class TAO_Acceptor; class TAO_Export TAO_Acceptor_Filter { public: - virtual ~TAO_Acceptor_Filter (void); + virtual ~TAO_Acceptor_Filter (); /** * Populate @a mprofile with profiles. Profiles are created for diff --git a/TAO/tao/Acceptor_Registry.cpp b/TAO/tao/Acceptor_Registry.cpp index 9adc59e4f45..f502fe89c0d 100644 --- a/TAO/tao/Acceptor_Registry.cpp +++ b/TAO/tao/Acceptor_Registry.cpp @@ -24,13 +24,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Acceptor_Registry::TAO_Acceptor_Registry (void) - : acceptors_ (0), +TAO_Acceptor_Registry::TAO_Acceptor_Registry () + : acceptors_ (nullptr), size_ (0) { } -TAO_Acceptor_Registry::~TAO_Acceptor_Registry (void) +TAO_Acceptor_Registry::~TAO_Acceptor_Registry () { this->close_all (); @@ -38,7 +38,7 @@ TAO_Acceptor_Registry::~TAO_Acceptor_Registry (void) } size_t -TAO_Acceptor_Registry::endpoint_count (void) +TAO_Acceptor_Registry::endpoint_count () { size_t count = 0; const TAO_AcceptorSetIterator end = this->end (); @@ -77,7 +77,7 @@ TAO_Acceptor_Registry::is_collocated (const TAO_MProfile &mprofile) // operation if the below is_collocated() call // also executes a loop. for (TAO_Endpoint *endp = pf->endpoint (); - endp != 0; + endp != nullptr; endp = endp->next ()) { if ((*i)->is_collocated (endp)) @@ -106,7 +106,7 @@ TAO_Acceptor_Registry::get_acceptor (CORBA::ULong tag) } } - return 0; + return nullptr; } int @@ -121,7 +121,7 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core, // All TAO pluggable protocols are expected to have the ability // to create a default endpoint. - && this->open_default (orb_core, reactor, 0) == -1) + && this->open_default (orb_core, reactor, nullptr) == -1) { throw ::CORBA::INTERNAL ( CORBA::SystemException::_tao_minor_code ( @@ -135,7 +135,7 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core, size_t acceptor_count = 0; TAO_EndpointSetIterator endpts (endpoint_set); - for (ACE_CString *ep = 0; + for (ACE_CString *ep = nullptr; endpts.next (ep) != 0; endpts.advance ()) { @@ -199,7 +199,7 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core, ep->c_str () + ACE_OS::strlen (ep->c_str ()); for (const char *e = ACE_OS::strchr (ep->c_str (), ','); - e != 0 && e != ep_end; + e != nullptr && e != ep_end; e = ACE_OS::strchr (e, ',')) { ++acceptor_count; @@ -209,7 +209,7 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core, // The array containing the TAO_Acceptors will never contain more // than the number of endpoints stored in TAO_ORB_Parameters. - if (this->acceptors_ == 0) + if (this->acceptors_ == nullptr) { ACE_NEW_THROW_EX (this->acceptors_, TAO_Acceptor *[acceptor_count], @@ -222,7 +222,7 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core, TAO_EndpointSetIterator endpoints (endpoint_set); - for (ACE_CString *endpoint = 0; + for (ACE_CString *endpoint = nullptr; endpoints.next (endpoint) != 0; endpoints.advance ()) { @@ -482,7 +482,7 @@ int TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core, // endpoints were specified by the user, meaning that the number of // acceptors will never be more than the number of loaded protocols // in the ORB core. - if (this->acceptors_ == 0) + if (this->acceptors_ == nullptr) { ACE_NEW_RETURN (this->acceptors_, TAO_Acceptor *[pfs->size ()], @@ -552,7 +552,7 @@ TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core, // Make an acceptor TAO_Acceptor *acceptor = (*factory)->factory ()->make_acceptor (); - if (acceptor == 0) + if (acceptor == nullptr) { if (TAO_debug_level > 0) { @@ -611,13 +611,13 @@ TAO_Acceptor_Registry::open_default_i (TAO_ORB_Core *orb_core, } int -TAO_Acceptor_Registry::close_all (void) +TAO_Acceptor_Registry::close_all () { const TAO_AcceptorSetIterator end = this->end (); for (TAO_AcceptorSetIterator i = this->begin (); i != end; ++i) { - if (*i != 0) + if (*i != nullptr) { (*i)->close (); delete *i; @@ -679,14 +679,14 @@ TAO_Acceptor_Registry::open_i (TAO_ORB_Core *orb_core, ACE_CString options_tmp; this->extract_endpoint_options (addrs, options_tmp, (*factory)->factory ()); - const char *options = 0; + const char *options = nullptr; if (options_tmp.length () > 0) { options = options_tmp.c_str (); } - char *last_addr = 0; + char *last_addr = nullptr; ACE_Auto_Basic_Array_Ptr<char> addr_str (addrs.rep ()); const char *astr = ACE_OS::strtok_r (addr_str.get (), ",", &last_addr); @@ -699,11 +699,11 @@ TAO_Acceptor_Registry::open_i (TAO_ORB_Core *orb_core, // possible for astr to be 0. This indicates that // the user is requesting the default endpoint for // the specified protocol. - ACE_CString address (astr == 0 ? "" : astr); + ACE_CString address (astr == nullptr ? "" : astr); TAO_Acceptor *acceptor = (*factory)->factory ()->make_acceptor (); - if (acceptor != 0) + if (acceptor != nullptr) { // Extract the desired endpoint/protocol version if one // exists. @@ -878,7 +878,7 @@ TAO_Acceptor_Registry::open_i (TAO_ORB_Core *orb_core, CORBA::COMPLETED_NO); } } - while (astr != 0 && (astr = ACE_OS::strtok_r (0, ",", &last_addr)) != 0); + while (astr != nullptr && (astr = ACE_OS::strtok_r (nullptr, ",", &last_addr)) != nullptr); return 0; } diff --git a/TAO/tao/Acceptor_Registry.h b/TAO/tao/Acceptor_Registry.h index 771982dd41e..dc0124ae18a 100644 --- a/TAO/tao/Acceptor_Registry.h +++ b/TAO/tao/Acceptor_Registry.h @@ -60,10 +60,10 @@ class TAO_Export TAO_Acceptor_Registry { public: /// Default constructor. - TAO_Acceptor_Registry (void); + TAO_Acceptor_Registry (); /// Default destructor. - ~TAO_Acceptor_Registry (void); + ~TAO_Acceptor_Registry (); /// Initialize all registered acceptors. Return -1 on error. int open (TAO_ORB_Core *orb_core, @@ -72,10 +72,10 @@ public: bool ignore_address); /// Close all open acceptors. - int close_all (void); + int close_all (); /// Returns the total number of endpoints in all of its acceptors. - size_t endpoint_count (void); + size_t endpoint_count (); /// Check if there is at least one profile in @a mprofile that /// corresponds to a collocated object. @@ -85,8 +85,8 @@ public: TAO_Acceptor *get_acceptor (CORBA::ULong tag); // = Iterator. - TAO_AcceptorSetIterator begin (void); - TAO_AcceptorSetIterator end (void); + TAO_AcceptorSetIterator begin (); + TAO_AcceptorSetIterator end (); private: ACE_UNIMPLEMENTED_FUNC (TAO_Acceptor_Registry (const TAO_Acceptor_Registry &)) diff --git a/TAO/tao/Adapter.cpp b/TAO/tao/Adapter.cpp index b77750e0b27..bc5ff33898d 100644 --- a/TAO/tao/Adapter.cpp +++ b/TAO/tao/Adapter.cpp @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Adapter::~TAO_Adapter (void) +TAO_Adapter::~TAO_Adapter () { } diff --git a/TAO/tao/Adapter.h b/TAO/tao/Adapter.h index 41f12d50af0..e9f0556a7d5 100644 --- a/TAO/tao/Adapter.h +++ b/TAO/tao/Adapter.h @@ -45,10 +45,10 @@ class TAO_ServerRequest; class TAO_Export TAO_Adapter { public: - virtual ~TAO_Adapter (void); + virtual ~TAO_Adapter (); /// Initialize the Adapter - virtual void open (void) = 0; + virtual void open () = 0; /// The ORB is shutting down, destroy any resources attached to this /// adapter. @@ -63,7 +63,7 @@ public: * Adapters at higher priority are used first, the first adapter * that matches a key is used to dispatch a request. */ - virtual int priority (void) const = 0; + virtual int priority () const = 0; /// Return the status.... virtual int dispatch (TAO::ObjectKey &key, @@ -94,14 +94,14 @@ public: /// Return the name, i.e. the object id used to resolve it in the /// ORB. - virtual const char *name (void) const = 0; + virtual const char *name () const = 0; /** * Return the root of the Object Adapter. * Each adapter defines its own IDL interface accessed through the * method above. */ - virtual CORBA::Object_ptr root (void) = 0; + virtual CORBA::Object_ptr root () = 0; /// Create a collocated object using the given profile and stub. virtual CORBA::Object_ptr create_collocated_object (TAO_Stub *, diff --git a/TAO/tao/Adapter_Factory.cpp b/TAO/tao/Adapter_Factory.cpp index 20a5f497a1a..3485f9913da 100644 --- a/TAO/tao/Adapter_Factory.cpp +++ b/TAO/tao/Adapter_Factory.cpp @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Adapter_Factory::~TAO_Adapter_Factory (void) +TAO_Adapter_Factory::~TAO_Adapter_Factory () { } diff --git a/TAO/tao/Adapter_Factory.h b/TAO/tao/Adapter_Factory.h index 876864a2240..20105ad3964 100644 --- a/TAO/tao/Adapter_Factory.h +++ b/TAO/tao/Adapter_Factory.h @@ -33,7 +33,7 @@ class TAO_Export TAO_Adapter_Factory : public ACE_Service_Object { public: /// Destructor - virtual ~TAO_Adapter_Factory (void); + virtual ~TAO_Adapter_Factory (); /// Create a new adapter virtual TAO_Adapter *create (TAO_ORB_Core *orb_core) = 0; diff --git a/TAO/tao/Adapter_Registry.cpp b/TAO/tao/Adapter_Registry.cpp index e6c04ff658d..df2ab410265 100644 --- a/TAO/tao/Adapter_Registry.cpp +++ b/TAO/tao/Adapter_Registry.cpp @@ -15,13 +15,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Adapter_Registry::TAO_Adapter_Registry (TAO_ORB_Core *) : adapters_capacity_ (16), // @@ Make it configurable adapters_count_ (0), - adapters_ (0) + adapters_ (nullptr) { ACE_NEW (this->adapters_, TAO_Adapter*[this->adapters_capacity_]); } -TAO_Adapter_Registry::~TAO_Adapter_Registry (void) +TAO_Adapter_Registry::~TAO_Adapter_Registry () { for (size_t i = 0; i != this->adapters_count_; ++i) delete this->adapters_[i]; @@ -67,7 +67,7 @@ TAO_Adapter_Registry::insert (TAO_Adapter *adapter) if (this->adapters_capacity_ == this->adapters_count_) { this->adapters_capacity_ *= 2; - TAO_Adapter **tmp = 0; + TAO_Adapter **tmp = nullptr; ACE_NEW_THROW_EX (tmp, TAO_Adapter*[this->adapters_capacity_], CORBA::NO_MEMORY ()); @@ -126,7 +126,7 @@ TAO_Adapter_Registry::create_collocated_object (TAO_Stub *stub, { CORBA::Object_ptr x = this->adapters_[i]->create_collocated_object (stub, mprofile); - if (x != 0) + if (x != nullptr) { if (!stub->collocated_servant ()) { @@ -145,7 +145,7 @@ TAO_Adapter_Registry::create_collocated_object (TAO_Stub *stub, return x; } } - return 0; + return nullptr; } CORBA::Long @@ -174,7 +174,7 @@ TAO_Adapter_Registry::find_adapter (const char *name) const if (ACE_OS::strcmp ((*i)->name (), name) == 0) return *i; - return 0; + return nullptr; } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Adapter_Registry.h b/TAO/tao/Adapter_Registry.h index 421fc0b234a..037f59e23d2 100644 --- a/TAO/tao/Adapter_Registry.h +++ b/TAO/tao/Adapter_Registry.h @@ -51,7 +51,7 @@ public: explicit TAO_Adapter_Registry (TAO_ORB_Core *); /// Close the - ~TAO_Adapter_Registry (void); + ~TAO_Adapter_Registry (); /** * Close each of of the Adapters and then cleanup the Registry. diff --git a/TAO/tao/Allocator.h b/TAO/tao/Allocator.h index c4b68cd521f..6209d77710e 100644 --- a/TAO/tao/Allocator.h +++ b/TAO/tao/Allocator.h @@ -35,7 +35,7 @@ namespace TAO { public: - virtual ~TAO_Allocator (void) {} + virtual ~TAO_Allocator () {} virtual handler_type *allocate () = 0; virtual void release (handler_type *ptr) = 0; diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode.h b/TAO/tao/AnyTypeCode/Alias_TypeCode.h index d617283dbb0..4b525902eb6 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode.h @@ -66,8 +66,8 @@ namespace TAO //@{ virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const; - virtual void tao_duplicate (void); - virtual void tao_release (void); + virtual void tao_duplicate (); + virtual void tao_release (); //@} protected: @@ -82,10 +82,10 @@ namespace TAO //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; - virtual char const * id_i (void) const; - virtual char const * name_i (void) const; - virtual CORBA::TypeCode_ptr content_type_i (void) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; + virtual char const * id_i () const; + virtual char const * name_i () const; + virtual CORBA::TypeCode_ptr content_type_i () const; private: /// Base attributes for this @c TypeCode containing the diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp index 6a89a9dcb7b..48e0a7a074e 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp @@ -57,14 +57,14 @@ TAO::TypeCode::Alias<char const *, void TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, - TAO::Null_RefCount_Policy>::tao_duplicate (void) + TAO::Null_RefCount_Policy>::tao_duplicate () { } void TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, - TAO::Null_RefCount_Policy>::tao_release (void) + TAO::Null_RefCount_Policy>::tao_release () { } @@ -100,7 +100,7 @@ TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, - TAO::Null_RefCount_Policy>::get_compact_typecode_i (void) const + TAO::Null_RefCount_Policy>::get_compact_typecode_i () const { TAO_TypeCodeFactory_Adapter * const adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( @@ -132,7 +132,7 @@ TAO::TypeCode::Alias<char const *, char const * TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, - TAO::Null_RefCount_Policy>::id_i (void) const + TAO::Null_RefCount_Policy>::id_i () const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -142,7 +142,7 @@ TAO::TypeCode::Alias<char const *, char const * TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, - TAO::Null_RefCount_Policy>::name_i (void) const + TAO::Null_RefCount_Policy>::name_i () const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -152,7 +152,7 @@ TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, - TAO::Null_RefCount_Policy>::content_type_i (void) const + TAO::Null_RefCount_Policy>::content_type_i () const { return CORBA::TypeCode::_duplicate ( diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h index 05a8f675fac..96c9bac0238 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h @@ -69,8 +69,8 @@ namespace TAO */ //@{ virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const; - virtual void tao_duplicate (void); - virtual void tao_release (void); + virtual void tao_duplicate (); + virtual void tao_release (); //@} protected: @@ -85,10 +85,10 @@ namespace TAO //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; - virtual char const * id_i (void) const; - virtual char const * name_i (void) const; - virtual CORBA::TypeCode_ptr content_type_i (void) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; + virtual char const * id_i () const; + virtual char const * name_i () const; + virtual CORBA::TypeCode_ptr content_type_i () const; private: /// Base attributes for this @c TypeCode containing the diff --git a/TAO/tao/AnyTypeCode/Any.cpp b/TAO/tao/AnyTypeCode/Any.cpp index b74124189a3..45e7c8c7c51 100644 --- a/TAO/tao/AnyTypeCode/Any.cpp +++ b/TAO/tao/AnyTypeCode/Any.cpp @@ -23,7 +23,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL using namespace TAO; -CORBA::Any::Any (void) +CORBA::Any::Any () : impl_ (0) { } @@ -37,7 +37,7 @@ CORBA::Any::Any (const CORBA::Any &rhs) } } -CORBA::Any::~Any (void) +CORBA::Any::~Any () { if (this->impl_ != 0) { @@ -80,7 +80,7 @@ CORBA::Any::replace (TAO::Any_Impl *new_impl) } CORBA::TypeCode_ptr -CORBA::Any::type (void) const +CORBA::Any::type () const { if (this->impl_ != 0) { @@ -91,7 +91,7 @@ CORBA::Any::type (void) const } CORBA::TypeCode_ptr -CORBA::Any::_tao_get_typecode (void) const +CORBA::Any::_tao_get_typecode () const { if (this->impl_ != 0) { @@ -116,7 +116,7 @@ CORBA::Any::_tao_set_typecode (const CORBA::TypeCode_ptr tc) } int -CORBA::Any::_tao_byte_order (void) const +CORBA::Any::_tao_byte_order () const { if (this->impl_ != 0) { diff --git a/TAO/tao/AnyTypeCode/Any.h b/TAO/tao/AnyTypeCode/Any.h index 2f644c9ad78..9f879820950 100644 --- a/TAO/tao/AnyTypeCode/Any.h +++ b/TAO/tao/AnyTypeCode/Any.h @@ -66,13 +66,13 @@ namespace CORBA typedef Any_var _var_type; typedef Any_out _out_type; - Any (void); + Any (); Any (const Any &); - ~Any (void); + ~Any (); Any &operator= (const Any &); - TAO::Any_Impl *impl (void) const; + TAO::Any_Impl *impl () const; /// Used in our destruction if we ourselves are stored in an Any. static void _tao_any_destructor (void *); @@ -146,19 +146,19 @@ namespace CORBA void replace (TAO::Any_Impl *); /// Return TypeCode of the element stored in the Any. - TypeCode_ptr type (void) const; + TypeCode_ptr type () const; /// For use along with <<= of a value of aliased type when the alias must /// be preserved. void type (TypeCode_ptr); /// TAO extension, does not return a duplicate. - CORBA::TypeCode_ptr _tao_get_typecode (void) const; + CORBA::TypeCode_ptr _tao_get_typecode () const; /// TAO extension. void _tao_set_typecode (const CORBA::TypeCode_ptr); - int _tao_byte_order (void) const; + int _tao_byte_order () const; private: CORBA::Boolean checked_to_object (CORBA::Object_ptr &) const; @@ -184,10 +184,10 @@ namespace CORBA class TAO_AnyTypeCode_Export Any_var { public: - Any_var (void); + Any_var (); Any_var (Any *a); Any_var (const Any_var &); - ~Any_var (void); + ~Any_var (); Any_var &operator= (Any *); @@ -200,7 +200,7 @@ namespace CORBA Any_var &operator= (const Any_var &); /// Arrow operator (smart pointer). - Any *operator-> (void); + Any *operator-> (); /// Cast. operator const Any *() const; @@ -209,19 +209,19 @@ namespace CORBA operator Any *&(); /// For in Any parameter. - const Any &in (void) const; + const Any &in () const; /// For inout Any parameter. - Any &inout (void); + Any &inout (); /// For out Any parameter. - Any *&out (void); + Any *&out (); /// For Any return type. - Any *_retn (void); + Any *_retn (); /// TAO specific extension - Any *ptr (void) const; + Any *ptr () const; private: /// Holds the Any. Any *ptr_; @@ -252,9 +252,9 @@ namespace CORBA operator Any *&(); /// Return underlying instance. - Any *& ptr (void); + Any *& ptr (); - Any *operator-> (void); + Any *operator-> (); private: /// Assignment from _var disallowed. diff --git a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp index cb8beef4ed0..7c9a1911696 100644 --- a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp +++ b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp @@ -287,7 +287,7 @@ TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, const CORBA::WS } int -TAO_AnyTypeCode_Adapter_Impl::Initializer (void) +TAO_AnyTypeCode_Adapter_Impl::Initializer () { // The TAO::Unknown_IDL_Type::lock_i () is a PRIVATE thread unsafe singleton // which we need to initialise before Unknown_IDL_Types are used in a diff --git a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h index ab8c7d6d3f6..566233eb0cf 100644 --- a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h +++ b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h @@ -32,7 +32,7 @@ class TAO_AnyTypeCode_Export TAO_AnyTypeCode_Adapter_Impl { public: // Used to force the initialization of the code. - static int Initializer (void); + static int Initializer (); #define ANYTYPECODE__EXCEPTION_LIST \ TAO_SYSTEM_EXCEPTION (UNKNOWN) \ diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp index 678233f3951..9222c88dbce 100644 --- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp @@ -93,11 +93,7 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any, T_forany::tao_alloc ()), false); -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO::Any_Array_Impl_T<T_slice, T_forany> > replacement_safety (replacement); -#else - auto_ptr<TAO::Any_Array_Impl_T<T_slice, T_forany> > replacement_safety (replacement); -#endif /* ACE_HAS_CPP11 */ // We know this will work since the unencoded case is covered above. TAO::Unknown_IDL_Type * const unk = @@ -161,8 +157,7 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::free_value (void) template<typename T_slice, typename T_forany> void -TAO::Any_Array_Impl_T<T_slice, T_forany>::_tao_decode (TAO_InputCDR &cdr - ) +TAO::Any_Array_Impl_T<T_slice, T_forany>::_tao_decode (TAO_InputCDR &cdr) { if (! this->demarshal_value (cdr)) { diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h index b2879bf3438..660d3080136 100644 --- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h @@ -51,8 +51,7 @@ namespace TAO virtual CORBA::Boolean marshal_value (TAO_OutputCDR &); CORBA::Boolean demarshal_value (TAO_InputCDR &); - virtual void _tao_decode (TAO_InputCDR & - ); + virtual void _tao_decode (TAO_InputCDR &); virtual const void *value (void) const; virtual void free_value (void); diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp b/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp index ace666a3009..8273695fffd 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp @@ -66,7 +66,7 @@ namespace TAO } } - Any_Basic_Impl::~Any_Basic_Impl (void) + Any_Basic_Impl::~Any_Basic_Impl () { } @@ -116,11 +116,7 @@ namespace TAO TAO::Any_Basic_Impl *replacement = TAO::Any_Basic_Impl::create_empty (any_tc); -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO::Any_Basic_Impl> replacement_safety (replacement); -#else - auto_ptr<TAO::Any_Basic_Impl> replacement_safety (replacement); -#endif /* ACE_HAS_CPP11 */ // We know this will work since the unencoded case is covered above. TAO::Unknown_IDL_Type * const unk = diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl.h b/TAO/tao/AnyTypeCode/Any_Basic_Impl.h index ab18778fc0f..c2796c62777 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl.h +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl.h @@ -40,7 +40,7 @@ namespace TAO Any_Basic_Impl (CORBA::TypeCode_ptr, void *value); - virtual ~Any_Basic_Impl (void); + virtual ~Any_Basic_Impl (); static void insert (CORBA::Any &, CORBA::TypeCode_ptr, diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp index a45b3b2481b..7e82b968f9f 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp @@ -78,11 +78,7 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any, TAO::Any_Basic_Impl_T<T> * const replacement = TAO::Any_Basic_Impl_T<T>::create_empty (any_tc); -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO::Any_Basic_Impl_T<T> > replacement_safety (replacement); -#else - auto_ptr<TAO::Any_Basic_Impl_T<T> > replacement_safety (replacement); -#endif /* ACE_HAS_CPP11 */ // We know this will work since the unencoded case is covered above. TAO::Unknown_IDL_Type * const unk = diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h index dd1395d764d..fdd7343bbaf 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h @@ -37,7 +37,7 @@ namespace TAO public: Any_Basic_Impl_T (CORBA::TypeCode_ptr, const T & val); - virtual ~Any_Basic_Impl_T (void); + virtual ~Any_Basic_Impl_T (); static void insert (CORBA::Any &, CORBA::TypeCode_ptr, @@ -50,7 +50,7 @@ namespace TAO CORBA::Boolean demarshal_value (TAO_InputCDR &); virtual void _tao_decode (TAO_InputCDR &); - virtual const void *value (void) const; + virtual const void *value () const; static Any_Basic_Impl_T<T> *create_empty (CORBA::TypeCode_ptr); private: diff --git a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp index 42cc10a0066..41bb34ba6aa 100644 --- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp @@ -158,11 +158,7 @@ TAO::Any_Dual_Impl_T<T>::replace (TAO_InputCDR &cdr, ACE_NEW_RETURN (empty_value, T, false); -#if defined (ACE_HAS_CPP11) std::unique_ptr<T> empty_value_safety (empty_value); -#else - auto_ptr<T> empty_value_safety (empty_value); -#endif /* ACE_HAS_CPP11 */ TAO::Any_Dual_Impl_T<T> *replacement = 0; ACE_NEW_RETURN (replacement, TAO::Any_Dual_Impl_T<T> (destructor, @@ -170,11 +166,7 @@ TAO::Any_Dual_Impl_T<T>::replace (TAO_InputCDR &cdr, empty_value), false); -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO::Any_Dual_Impl_T<T> > replacement_safety (replacement); -#else - auto_ptr<TAO::Any_Dual_Impl_T<T> > replacement_safety (replacement); -#endif /* ACE_HAS_CPP11 */ CORBA::Boolean const good_decode = replacement->demarshal_value (cdr); diff --git a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h index 4d35f4add89..dd627266355 100644 --- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h @@ -45,7 +45,7 @@ namespace TAO CORBA::TypeCode_ptr, const T &); Any_Dual_Impl_T (CORBA::TypeCode_ptr); - virtual ~Any_Dual_Impl_T (void); + virtual ~Any_Dual_Impl_T (); static void insert (CORBA::Any &, _tao_destructor, @@ -64,8 +64,8 @@ namespace TAO CORBA::Boolean demarshal_value (TAO_InputCDR &); virtual void _tao_decode (TAO_InputCDR &); - virtual const void *value (void) const; - virtual void free_value (void); + virtual const void *value () const; + virtual void free_value (); protected: void value (const T &); diff --git a/TAO/tao/AnyTypeCode/Any_Impl.cpp b/TAO/tao/AnyTypeCode/Any_Impl.cpp index 3633d68739f..b1867d468e3 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl.cpp +++ b/TAO/tao/AnyTypeCode/Any_Impl.cpp @@ -22,7 +22,7 @@ TAO::Any_Impl::Any_Impl (_tao_destructor destructor, { } -TAO::Any_Impl::~Any_Impl (void) +TAO::Any_Impl::~Any_Impl () { } @@ -56,20 +56,20 @@ TAO::Any_Impl::marshal (TAO_OutputCDR &cdr) } void -TAO::Any_Impl::free_value (void) +TAO::Any_Impl::free_value () { // We always have to do this. ::CORBA::release (this->type_); } CORBA::TypeCode_ptr -TAO::Any_Impl::type (void) const +TAO::Any_Impl::type () const { return CORBA::TypeCode::_duplicate (this->type_); } CORBA::TypeCode_ptr -TAO::Any_Impl::_tao_get_typecode (void) const +TAO::Any_Impl::_tao_get_typecode () const { return this->type_; } @@ -82,7 +82,7 @@ TAO::Any_Impl::type (CORBA::TypeCode_ptr tc) } int -TAO::Any_Impl::_tao_byte_order (void) const +TAO::Any_Impl::_tao_byte_order () const { return TAO_ENCAP_BYTE_ORDER; } @@ -102,13 +102,13 @@ TAO::Any_Impl::_tao_any_wstring_destructor (void *x) } void -TAO::Any_Impl::_add_ref (void) +TAO::Any_Impl::_add_ref () { ++this->refcount_; } void -TAO::Any_Impl::_remove_ref (void) +TAO::Any_Impl::_remove_ref () { CORBA::ULong const new_count = --this->refcount_; @@ -145,7 +145,7 @@ TAO::Any_Impl::to_abstract_base (CORBA::AbstractBase_ptr &) const } bool -TAO::Any_Impl::encoded (void) const +TAO::Any_Impl::encoded () const { return this->encoded_; } diff --git a/TAO/tao/AnyTypeCode/Any_Impl.h b/TAO/tao/AnyTypeCode/Any_Impl.h index 2446ec37368..622ade7405c 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl.h +++ b/TAO/tao/AnyTypeCode/Any_Impl.h @@ -22,15 +22,7 @@ #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" #include "tao/Basic_Types.h" - -#if defined (ACE_HAS_CPP11) -# include <atomic> -#else -# include "ace/Synch_Traits.h" -# include "ace/Null_Mutex.h" -# include "ace/Thread_Mutex.h" -# include "ace/Atomic_Op.h" -#endif /* ACE_HAS_CPP11 */ +#include <atomic> TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -69,16 +61,16 @@ namespace TAO CORBA::Boolean marshal (TAO_OutputCDR &); virtual CORBA::Boolean marshal_value (TAO_OutputCDR &) = 0; - virtual void free_value (void); + virtual void free_value (); - CORBA::TypeCode_ptr type (void) const; - CORBA::TypeCode_ptr _tao_get_typecode (void) const; + CORBA::TypeCode_ptr type () const; + CORBA::TypeCode_ptr _tao_get_typecode () const; void type (CORBA::TypeCode_ptr); - virtual int _tao_byte_order (void) const; + virtual int _tao_byte_order () const; - virtual void _add_ref (void); - virtual void _remove_ref (void); + virtual void _add_ref (); + virtual void _remove_ref (); /// Used to release these CORBA basic types. static void _tao_any_string_destructor (void *); @@ -90,13 +82,13 @@ namespace TAO virtual CORBA::Boolean to_value (CORBA::ValueBase *&) const; virtual CORBA::Boolean to_abstract_base (CORBA::AbstractBase_ptr &) const; - bool encoded (void) const; + bool encoded () const; protected: Any_Impl (_tao_destructor, CORBA::TypeCode_ptr, bool encoded = false); - virtual ~Any_Impl (void); + virtual ~Any_Impl (); TAO::Any_Impl::_tao_destructor value_destructor_; CORBA::TypeCode_ptr type_; @@ -104,11 +96,7 @@ namespace TAO private: /// Reference counter. -#if defined (ACE_HAS_CPP11) std::atomic<uint32_t> refcount_; -#else - ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; -#endif /* ACE_HAS_CPP11 */ }; } diff --git a/TAO/tao/AnyTypeCode/Any_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Impl_T.cpp index f389796bff3..c0ba6c2d82b 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Impl_T.cpp @@ -91,11 +91,7 @@ TAO::Any_Impl_T<T>::extract (const CORBA::Any & any, 0), false); -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO::Any_Impl_T<T> > replacement_safety (replacement); -#else - auto_ptr<TAO::Any_Impl_T<T> > replacement_safety (replacement); -#endif /* ACE_HAS_CPP11 */ // We know this will work since the unencoded case is covered above. TAO::Unknown_IDL_Type * const unk = diff --git a/TAO/tao/AnyTypeCode/Any_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Impl_T.h index 3be4db172f9..c69f916df91 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Impl_T.h @@ -43,7 +43,7 @@ namespace TAO Any_Impl_T (_tao_destructor destructor, CORBA::TypeCode_ptr, T * const); - virtual ~Any_Impl_T (void); + virtual ~Any_Impl_T (); static void insert (CORBA::Any &, _tao_destructor destructor, @@ -61,8 +61,8 @@ namespace TAO virtual CORBA::Boolean marshal_value (TAO_OutputCDR &); CORBA::Boolean demarshal_value (TAO_InputCDR &); virtual void _tao_decode (TAO_InputCDR & ); - virtual const void *value (void) const; - virtual void free_value (void); + virtual const void *value () const; + virtual void free_value (); private: T * value_; diff --git a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp index a5cdeb3239d..b728b74f42c 100644 --- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp @@ -129,11 +129,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any, bound), false); -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO::Any_Special_Impl_T<T, from_T, to_T> > replacement_safety (replacement); -#else - auto_ptr<TAO::Any_Special_Impl_T<T, from_T, to_T> > replacement_safety (replacement); -#endif /* ACE_HAS_CPP11 */ // We know this will work since the unencoded case is covered above. TAO::Unknown_IDL_Type * const unk = diff --git a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h index c153ea9ce8c..c57d09c7a04 100644 --- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h @@ -37,7 +37,7 @@ namespace TAO CORBA::TypeCode_ptr, T * const, CORBA::ULong bound); - virtual ~Any_Special_Impl_T (void); + virtual ~Any_Special_Impl_T (); static void insert (CORBA::Any &, _tao_destructor destructor, @@ -52,11 +52,10 @@ namespace TAO virtual CORBA::Boolean marshal_value (TAO_OutputCDR &); CORBA::Boolean demarshal_value (TAO_InputCDR &); - virtual void _tao_decode (TAO_InputCDR & - ); + virtual void _tao_decode (TAO_InputCDR &); - virtual const void *value (void) const; - virtual void free_value (void); + virtual const void *value () const; + virtual void free_value (); private: T * value_; diff --git a/TAO/tao/AnyTypeCode/Any_SystemException.cpp b/TAO/tao/AnyTypeCode/Any_SystemException.cpp index 2e06f71b942..1e905894b64 100644 --- a/TAO/tao/AnyTypeCode/Any_SystemException.cpp +++ b/TAO/tao/AnyTypeCode/Any_SystemException.cpp @@ -40,7 +40,7 @@ TAO::Any_SystemException::Any_SystemException (CORBA::TypeCode_ptr tc) { } -TAO::Any_SystemException::~Any_SystemException (void) +TAO::Any_SystemException::~Any_SystemException () { } @@ -116,11 +116,7 @@ TAO::Any_SystemException::extract (const CORBA::Any & any, empty_value), false); -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO::Any_SystemException > replacement_safety (replacement); -#else - auto_ptr<TAO::Any_SystemException > replacement_safety (replacement); -#endif /* ACE_HAS_CPP11 */ // We know this will work since the unencoded case is covered above. TAO::Unknown_IDL_Type * const unk = @@ -152,7 +148,7 @@ TAO::Any_SystemException::extract (const CORBA::Any & any, } void -TAO::Any_SystemException::free_value (void) +TAO::Any_SystemException::free_value () { if (this->value_destructor_ != 0) { @@ -165,7 +161,7 @@ TAO::Any_SystemException::free_value (void) } const void * -TAO::Any_SystemException::value (void) const +TAO::Any_SystemException::value () const { return this->value_; } diff --git a/TAO/tao/AnyTypeCode/Any_SystemException.h b/TAO/tao/AnyTypeCode/Any_SystemException.h index 2cb231476f4..622e5e501d4 100644 --- a/TAO/tao/AnyTypeCode/Any_SystemException.h +++ b/TAO/tao/AnyTypeCode/Any_SystemException.h @@ -50,7 +50,7 @@ namespace TAO Any_SystemException (CORBA::TypeCode_ptr); - virtual ~Any_SystemException (void); + virtual ~Any_SystemException (); static void insert (CORBA::Any &, _tao_destructor, @@ -71,8 +71,8 @@ namespace TAO virtual CORBA::Boolean marshal_value (TAO_OutputCDR &); CORBA::Boolean demarshal_value (TAO_InputCDR &); - virtual const void *value (void) const; - virtual void free_value (void); + virtual const void *value () const; + virtual void free_value (); protected: CORBA::SystemException *value_; diff --git a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp index 72e818c8ca7..bacd24e67d5 100644 --- a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp +++ b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp @@ -14,7 +14,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::Unknown_IDL_Type::LOCK const -TAO::Unknown_IDL_Type::lock_i (void) +TAO::Unknown_IDL_Type::lock_i () { static LOCK base_lock_ (new ACE_Lock_Adapter<TAO_SYNCH_MUTEX>()); return base_lock_; @@ -49,7 +49,7 @@ TAO::Unknown_IDL_Type::Unknown_IDL_Type (CORBA::TypeCode_ptr tc) { } -TAO::Unknown_IDL_Type::~Unknown_IDL_Type (void) +TAO::Unknown_IDL_Type::~Unknown_IDL_Type () { } @@ -81,25 +81,25 @@ TAO::Unknown_IDL_Type::marshal_value (TAO_OutputCDR & cdr) } const void * -TAO::Unknown_IDL_Type::value (void) const +TAO::Unknown_IDL_Type::value () const { return this->cdr_.start (); } void -TAO::Unknown_IDL_Type::free_value (void) +TAO::Unknown_IDL_Type::free_value () { ::CORBA::release (this->type_); } TAO_InputCDR & -TAO::Unknown_IDL_Type::_tao_get_cdr (void) +TAO::Unknown_IDL_Type::_tao_get_cdr () { return this->cdr_; } int -TAO::Unknown_IDL_Type::_tao_byte_order (void) const +TAO::Unknown_IDL_Type::_tao_byte_order () const { return this->cdr_.byte_order (); } diff --git a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h index b313a294ef0..a26f7f02240 100644 --- a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h +++ b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h @@ -43,14 +43,14 @@ namespace TAO Unknown_IDL_Type (CORBA::TypeCode_ptr); - virtual ~Unknown_IDL_Type (void); + virtual ~Unknown_IDL_Type (); virtual CORBA::Boolean marshal_value (TAO_OutputCDR &); - virtual const void *value (void) const; - virtual void free_value (void); + virtual const void *value () const; + virtual void free_value (); - virtual TAO_InputCDR &_tao_get_cdr (void); - virtual int _tao_byte_order (void) const; + virtual TAO_InputCDR &_tao_get_cdr (); + virtual int _tao_byte_order () const; virtual void _tao_decode (TAO_InputCDR &); @@ -79,7 +79,7 @@ namespace TAO typedef ACE_Refcounted_Auto_Ptr<ACE_Lock, ACE_Lock_Adapter<TAO_SYNCH_MUTEX> > LOCK; - static LOCK const lock_i (void); + static LOCK const lock_i (); LOCK const lock_; mutable TAO_InputCDR cdr_; }; diff --git a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp index 1cf8645c5a2..6792fb8b35f 100644 --- a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp @@ -16,7 +16,7 @@ TAO::TypeCode::Empty_Param::tao_marshal (TAO_OutputCDR &, CORBA::ULong) const } void -TAO::TypeCode::Empty_Param::tao_duplicate (void) +TAO::TypeCode::Empty_Param::tao_duplicate () { // No-op since empty parameter TypeCodes are never created // dynamically, meaning there is no need to implement reference @@ -24,7 +24,7 @@ TAO::TypeCode::Empty_Param::tao_duplicate (void) } void -TAO::TypeCode::Empty_Param::tao_release (void) +TAO::TypeCode::Empty_Param::tao_release () { // No-op since empty parameter TypeCodes are never created // dynamically, meaning there is no need to implement reference @@ -58,7 +58,7 @@ TAO::TypeCode::Empty_Param::equivalent_i (CORBA::TypeCode_ptr tc) const } CORBA::TypeCode_ptr -TAO::TypeCode::Empty_Param::get_compact_typecode_i (void) const +TAO::TypeCode::Empty_Param::get_compact_typecode_i () const { // Already compact since parameter list is empty. diff --git a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h index d0ef4e370c2..ba194eff926 100644 --- a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h @@ -60,8 +60,8 @@ namespace TAO //@{ virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const; - virtual void tao_duplicate (void); - virtual void tao_release (void); + virtual void tao_duplicate (); + virtual void tao_release (); //@} protected: @@ -76,7 +76,7 @@ namespace TAO //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; }; } // End namespace TypeCode diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp b/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp index 2297a263a00..37e64256a52 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp @@ -157,8 +157,7 @@ TAO::TypeCode::Enum<StringType, adapter->create_enum_tc (this->base_attributes_.id (), "" /* empty name */, tc_enumerators, - this->nenumerators_ - ); + this->nenumerators_); } template <typename StringType, class EnumeratorArrayType, class RefCountPolicy> diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode.h b/TAO/tao/AnyTypeCode/Enum_TypeCode.h index dbd05818165..245bb43c630 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.h @@ -63,8 +63,8 @@ namespace TAO */ //@{ virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const; - virtual void tao_duplicate (void); - virtual void tao_release (void); + virtual void tao_duplicate (); + virtual void tao_release (); //@} protected: @@ -78,10 +78,10 @@ namespace TAO //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; - virtual char const * id_i (void) const; - virtual char const * name_i (void) const; - virtual CORBA::ULong member_count_i (void) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; + virtual char const * id_i () const; + virtual char const * name_i () const; + virtual CORBA::ULong member_count_i () const; virtual char const * member_name_i (CORBA::ULong index) const; //@} diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp index 5ef55878740..81af701debf 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp @@ -58,14 +58,14 @@ TAO::TypeCode::Enum<char const *, void TAO::TypeCode::Enum<char const *, char const * const *, - TAO::Null_RefCount_Policy>::tao_duplicate (void) + TAO::Null_RefCount_Policy>::tao_duplicate () { } void TAO::TypeCode::Enum<char const *, char const * const *, - TAO::Null_RefCount_Policy>::tao_release (void) + TAO::Null_RefCount_Policy>::tao_release () { } @@ -124,7 +124,7 @@ CORBA::TypeCode_ptr TAO::TypeCode::Enum<char const *, char const * const *, TAO::Null_RefCount_Policy>::get_compact_typecode_i ( - void) const + ) const { ACE_Array_Base<CORBA::String_var> tc_enumerators (this->nenumerators_); @@ -154,15 +154,14 @@ TAO::TypeCode::Enum<char const *, adapter->create_enum_tc (this->base_attributes_.id (), "" /* empty name */, tc_enumerators, - this->nenumerators_ - ); + this->nenumerators_); } char const * TAO::TypeCode::Enum<char const *, char const * const *, TAO::Null_RefCount_Policy>::id_i ( - void) const + ) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -173,7 +172,7 @@ char const * TAO::TypeCode::Enum<char const *, char const * const *, TAO::Null_RefCount_Policy>::name_i ( - void) const + ) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -184,7 +183,7 @@ CORBA::ULong TAO::TypeCode::Enum<char const *, char const * const *, TAO::Null_RefCount_Policy>::member_count_i ( - void) const + ) const { return this->nenumerators_; } diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h index 8fd342a90ef..4e35dc18586 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h @@ -69,8 +69,8 @@ namespace TAO //@{ virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const; - virtual void tao_duplicate (void); - virtual void tao_release (void); + virtual void tao_duplicate (); + virtual void tao_release (); //@} protected: @@ -84,10 +84,10 @@ namespace TAO //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; - virtual char const * id_i (void) const; - virtual char const * name_i (void) const; - virtual CORBA::ULong member_count_i (void) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; + virtual char const * id_i () const; + virtual char const * name_i () const; + virtual CORBA::ULong member_count_i () const; virtual char const * member_name_i (CORBA::ULong index) const; //@} diff --git a/TAO/tao/AnyTypeCode/Fixed_TypeCode.h b/TAO/tao/AnyTypeCode/Fixed_TypeCode.h index 56a6b685fa0..e84730b2469 100644 --- a/TAO/tao/AnyTypeCode/Fixed_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Fixed_TypeCode.h @@ -57,8 +57,8 @@ namespace TAO */ //@{ virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const; - virtual void tao_duplicate (void); - virtual void tao_release (void); + virtual void tao_duplicate (); + virtual void tao_release (); //@} protected: @@ -73,9 +73,9 @@ namespace TAO //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; - virtual CORBA::UShort fixed_digits_i (void) const; - virtual CORBA::UShort fixed_scale_i (void) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; + virtual CORBA::UShort fixed_digits_i () const; + virtual CORBA::UShort fixed_scale_i () const; private: /// The number of significant digits. diff --git a/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.cpp b/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.cpp index ec34f735087..93a88f1bbc7 100644 --- a/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.cpp @@ -24,7 +24,7 @@ TAO::TypeCode::Indirected_Type::tao_marshal (TAO_OutputCDR & cdr, } void -TAO::TypeCode::Indirected_Type::tao_duplicate (void) +TAO::TypeCode::Indirected_Type::tao_duplicate () { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); @@ -39,7 +39,7 @@ TAO::TypeCode::Indirected_Type::tao_duplicate (void) } void -TAO::TypeCode::Indirected_Type::tao_release (void) +TAO::TypeCode::Indirected_Type::tao_release () { unsigned long newcount; CORBA::TypeCode_ptr curmaster; @@ -103,25 +103,25 @@ TAO::TypeCode::Indirected_Type::equivalent_i ( } CORBA::TypeCode_ptr -TAO::TypeCode::Indirected_Type::get_compact_typecode_i (void) const +TAO::TypeCode::Indirected_Type::get_compact_typecode_i () const { return this->recursive_tc_ ? this->recursive_tc_->get_compact_typecode () : 0; } char const * -TAO::TypeCode::Indirected_Type::id_i (void) const +TAO::TypeCode::Indirected_Type::id_i () const { return this->id_.in (); } char const * -TAO::TypeCode::Indirected_Type::name_i (void) const +TAO::TypeCode::Indirected_Type::name_i () const { return this->recursive_tc_ ? this->recursive_tc_->name () : 0; } CORBA::ULong -TAO::TypeCode::Indirected_Type::member_count_i (void) const +TAO::TypeCode::Indirected_Type::member_count_i () const { return this->recursive_tc_ ? this->recursive_tc_->member_count () : 0; } @@ -147,13 +147,13 @@ TAO::TypeCode::Indirected_Type::member_visibility_i (CORBA::ULong index) const } CORBA::ValueModifier -TAO::TypeCode::Indirected_Type::type_modifier_i (void) const +TAO::TypeCode::Indirected_Type::type_modifier_i () const { return this->recursive_tc_ ? this->recursive_tc_->type_modifier () : 0; } CORBA::TypeCode_ptr -TAO::TypeCode::Indirected_Type::concrete_base_type_i (void) const +TAO::TypeCode::Indirected_Type::concrete_base_type_i () const { return this->recursive_tc_ ? this->recursive_tc_->concrete_base_type () : 0; } @@ -165,13 +165,13 @@ TAO::TypeCode::Indirected_Type::member_label_i (CORBA::ULong index) const } CORBA::TypeCode_ptr -TAO::TypeCode::Indirected_Type::discriminator_type_i (void) const +TAO::TypeCode::Indirected_Type::discriminator_type_i () const { return this->recursive_tc_ ? this->recursive_tc_->discriminator_type () : 0; } CORBA::Long -TAO::TypeCode::Indirected_Type::default_index_i (void) const +TAO::TypeCode::Indirected_Type::default_index_i () const { return this->recursive_tc_ ? this->recursive_tc_->default_index () : 0; } diff --git a/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.h b/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.h index b72f0d14f2e..4d810a4150a 100644 --- a/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.h @@ -64,8 +64,8 @@ namespace TAO //@{ virtual bool tao_marshal_kind (TAO_OutputCDR & cdr) const; virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const; - virtual void tao_duplicate (void); - virtual void tao_release (void); + virtual void tao_duplicate (); + virtual void tao_release (); //@} /// Setter for recursive reference. @@ -83,10 +83,10 @@ namespace TAO //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; - virtual char const * id_i (void) const; - virtual char const * name_i (void) const; - virtual CORBA::ULong member_count_i (void) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; + virtual char const * id_i () const; + virtual char const * name_i () const; + virtual CORBA::ULong member_count_i () const; virtual char const * member_name_i (CORBA::ULong index) const; virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index) const; //@} @@ -101,8 +101,8 @@ namespace TAO */ //@{ virtual CORBA::Any * member_label_i (CORBA::ULong index) const; - virtual CORBA::TypeCode_ptr discriminator_type_i (void) const; - virtual CORBA::Long default_index_i (void) const; + virtual CORBA::TypeCode_ptr discriminator_type_i () const; + virtual CORBA::Long default_index_i () const; //@} /** @@ -115,8 +115,8 @@ namespace TAO */ //@{ virtual CORBA::Visibility member_visibility_i (CORBA::ULong index) const; - virtual CORBA::ValueModifier type_modifier_i (void) const; - virtual CORBA::TypeCode_ptr concrete_base_type_i (void) const; + virtual CORBA::ValueModifier type_modifier_i () const; + virtual CORBA::TypeCode_ptr concrete_base_type_i () const; //@} private: diff --git a/TAO/tao/AnyTypeCode/Marshal.cpp b/TAO/tao/AnyTypeCode/Marshal.cpp index 965d22e645c..b7274bcd458 100644 --- a/TAO/tao/AnyTypeCode/Marshal.cpp +++ b/TAO/tao/AnyTypeCode/Marshal.cpp @@ -21,7 +21,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Marshal_Object::~TAO_Marshal_Object (void) +TAO_Marshal_Object::~TAO_Marshal_Object () { } diff --git a/TAO/tao/AnyTypeCode/Marshal.h b/TAO/tao/AnyTypeCode/Marshal.h index 09a5705b113..6c6bee37e03 100644 --- a/TAO/tao/AnyTypeCode/Marshal.h +++ b/TAO/tao/AnyTypeCode/Marshal.h @@ -75,10 +75,10 @@ class TAO_AnyTypeCode_Export TAO_Marshal_Object { public: /// constructor - TAO_Marshal_Object (void); + TAO_Marshal_Object (); /// destructor - virtual ~TAO_Marshal_Object (void); + virtual ~TAO_Marshal_Object (); /// skip entry point, it allocates the right kind of Marshal_Object /// and invokes skip on it. @@ -111,7 +111,7 @@ public: class TAO_AnyTypeCode_Export TAO_Marshal_Primitive: public TAO_Marshal_Object { public: - TAO_Marshal_Primitive (void); + TAO_Marshal_Primitive (); /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, @@ -133,7 +133,7 @@ public: class TAO_AnyTypeCode_Export TAO_Marshal_Any: public TAO_Marshal_Object { public: - TAO_Marshal_Any (void); + TAO_Marshal_Any (); /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, @@ -155,7 +155,7 @@ public: class TAO_AnyTypeCode_Export TAO_Marshal_TypeCode: public TAO_Marshal_Object { public: - TAO_Marshal_TypeCode (void); + TAO_Marshal_TypeCode (); /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, @@ -177,7 +177,7 @@ public: class TAO_AnyTypeCode_Export TAO_Marshal_Principal: public TAO_Marshal_Object { public: - TAO_Marshal_Principal (void); + TAO_Marshal_Principal (); /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, @@ -199,7 +199,7 @@ public: class TAO_AnyTypeCode_Export TAO_Marshal_ObjRef: public TAO_Marshal_Object { public: - TAO_Marshal_ObjRef (void); + TAO_Marshal_ObjRef (); /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, @@ -221,7 +221,7 @@ public: class TAO_AnyTypeCode_Export TAO_Marshal_Struct : public TAO_Marshal_Object { public: - TAO_Marshal_Struct (void); + TAO_Marshal_Struct (); /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, @@ -243,7 +243,7 @@ public: class TAO_AnyTypeCode_Export TAO_Marshal_Union: public TAO_Marshal_Object { public: - TAO_Marshal_Union (void); + TAO_Marshal_Union (); /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, @@ -265,7 +265,7 @@ public: class TAO_AnyTypeCode_Export TAO_Marshal_String: public TAO_Marshal_Object { public: - TAO_Marshal_String (void); + TAO_Marshal_String (); /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, @@ -287,7 +287,7 @@ public: class TAO_AnyTypeCode_Export TAO_Marshal_Sequence: public TAO_Marshal_Object { public: - TAO_Marshal_Sequence (void); + TAO_Marshal_Sequence (); /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, @@ -309,7 +309,7 @@ public: class TAO_AnyTypeCode_Export TAO_Marshal_Array: public TAO_Marshal_Object { public: - TAO_Marshal_Array (void); + TAO_Marshal_Array (); /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, @@ -331,7 +331,7 @@ public: class TAO_AnyTypeCode_Export TAO_Marshal_Alias: public TAO_Marshal_Object { public: - TAO_Marshal_Alias (void); + TAO_Marshal_Alias (); /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, @@ -353,7 +353,7 @@ public: class TAO_AnyTypeCode_Export TAO_Marshal_Except: public TAO_Marshal_Object { public: - TAO_Marshal_Except (void); + TAO_Marshal_Except (); /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, @@ -375,7 +375,7 @@ public: class TAO_AnyTypeCode_Export TAO_Marshal_WString : public TAO_Marshal_Object { public: - TAO_Marshal_WString (void); + TAO_Marshal_WString (); /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, @@ -397,7 +397,7 @@ public: class TAO_AnyTypeCode_Export TAO_Marshal_Value: public TAO_Marshal_Object { public: - TAO_Marshal_Value (void); + TAO_Marshal_Value (); /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, diff --git a/TAO/tao/AnyTypeCode/Marshal.inl b/TAO/tao/AnyTypeCode/Marshal.inl index 281a0225f2f..54d26c68102 100644 --- a/TAO/tao/AnyTypeCode/Marshal.inl +++ b/TAO/tao/AnyTypeCode/Marshal.inl @@ -3,77 +3,77 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_Marshal_Object::TAO_Marshal_Object (void) +TAO_Marshal_Object::TAO_Marshal_Object () { } ACE_INLINE -TAO_Marshal_Primitive::TAO_Marshal_Primitive (void) +TAO_Marshal_Primitive::TAO_Marshal_Primitive () { } ACE_INLINE -TAO_Marshal_Any::TAO_Marshal_Any (void) +TAO_Marshal_Any::TAO_Marshal_Any () { } ACE_INLINE -TAO_Marshal_Principal::TAO_Marshal_Principal (void) +TAO_Marshal_Principal::TAO_Marshal_Principal () { } ACE_INLINE -TAO_Marshal_TypeCode::TAO_Marshal_TypeCode (void) +TAO_Marshal_TypeCode::TAO_Marshal_TypeCode () { } ACE_INLINE -TAO_Marshal_ObjRef::TAO_Marshal_ObjRef (void) +TAO_Marshal_ObjRef::TAO_Marshal_ObjRef () { } ACE_INLINE -TAO_Marshal_Struct::TAO_Marshal_Struct (void) +TAO_Marshal_Struct::TAO_Marshal_Struct () { } ACE_INLINE -TAO_Marshal_Union::TAO_Marshal_Union (void) +TAO_Marshal_Union::TAO_Marshal_Union () { } ACE_INLINE -TAO_Marshal_String::TAO_Marshal_String (void) +TAO_Marshal_String::TAO_Marshal_String () { } ACE_INLINE -TAO_Marshal_Sequence::TAO_Marshal_Sequence (void) +TAO_Marshal_Sequence::TAO_Marshal_Sequence () { } ACE_INLINE -TAO_Marshal_Array::TAO_Marshal_Array (void) +TAO_Marshal_Array::TAO_Marshal_Array () { } ACE_INLINE -TAO_Marshal_Alias::TAO_Marshal_Alias (void) +TAO_Marshal_Alias::TAO_Marshal_Alias () { } ACE_INLINE -TAO_Marshal_Except::TAO_Marshal_Except (void) +TAO_Marshal_Except::TAO_Marshal_Except () { } ACE_INLINE -TAO_Marshal_WString::TAO_Marshal_WString (void) +TAO_Marshal_WString::TAO_Marshal_WString () { } ACE_INLINE -TAO_Marshal_Value::TAO_Marshal_Value (void) +TAO_Marshal_Value::TAO_Marshal_Value () : nested_processing_ (false) { } diff --git a/TAO/tao/AnyTypeCode/NVList.cpp b/TAO/tao/AnyTypeCode/NVList.cpp index 927ae22006c..7c0571e618f 100644 --- a/TAO/tao/AnyTypeCode/NVList.cpp +++ b/TAO/tao/AnyTypeCode/NVList.cpp @@ -23,13 +23,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Reference counting for DII Request object CORBA::ULong -CORBA::NamedValue::_incr_refcount (void) +CORBA::NamedValue::_incr_refcount () { return ++this->refcount_; } CORBA::ULong -CORBA::NamedValue::_decr_refcount (void) +CORBA::NamedValue::_decr_refcount () { CORBA::ULong const new_count = --this->refcount_; @@ -39,7 +39,7 @@ CORBA::NamedValue::_decr_refcount (void) return new_count; } -CORBA::NamedValue::~NamedValue (void) +CORBA::NamedValue::~NamedValue () { if (this->name_) { @@ -52,13 +52,13 @@ CORBA::NamedValue::~NamedValue (void) // **************************************************************** CORBA::ULong -CORBA::NVList::_incr_refcount (void) +CORBA::NVList::_incr_refcount () { return ++this->refcount_; } CORBA::ULong -CORBA::NVList::_decr_refcount (void) +CORBA::NVList::_decr_refcount () { CORBA::ULong const new_count = --this->refcount_; @@ -68,7 +68,7 @@ CORBA::NVList::_decr_refcount (void) return new_count; } -CORBA::NVList::~NVList (void) +CORBA::NVList::~NVList () { // initialize an iterator and delete each NamedValue ACE_Unbounded_Queue_Iterator<CORBA::NamedValue_ptr> iter (this->values_); @@ -402,7 +402,7 @@ CORBA::NVList::_tao_decode (TAO_InputCDR &incoming, int flag) } ptrdiff_t -CORBA::NVList::_tao_target_alignment (void) +CORBA::NVList::_tao_target_alignment () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, @@ -426,17 +426,13 @@ CORBA::NVList::_tao_target_alignment (void) } void -CORBA::NVList::evaluate (void) +CORBA::NVList::evaluate () { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); if (this->incoming_ != 0) { -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO_InputCDR> incoming (this->incoming_); -#else - auto_ptr<TAO_InputCDR> incoming (this->incoming_); -#endif /* ACE_HAS_CPP11 */ this->incoming_ = 0; this->_tao_decode (*(incoming.get ()), this->incoming_flag_); @@ -444,7 +440,7 @@ CORBA::NVList::evaluate (void) } CORBA::Boolean -CORBA::NVList::_lazy_has_arguments (void) const +CORBA::NVList::_lazy_has_arguments () const { if (this->incoming_ != 0) { diff --git a/TAO/tao/AnyTypeCode/NVList.h b/TAO/tao/AnyTypeCode/NVList.h index 001a1d7691d..989df82cd99 100644 --- a/TAO/tao/AnyTypeCode/NVList.h +++ b/TAO/tao/AnyTypeCode/NVList.h @@ -26,11 +26,7 @@ #include "ace/Unbounded_Queue.h" #include "ace/Thread_Mutex.h" -#if defined (ACE_HAS_CPP11) -# include <atomic> -#else -# include "ace/Atomic_Op.h" -#endif /* ACE_HAS_CPP11 */ +#include <atomic> TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -84,21 +80,21 @@ namespace CORBA public: /// optional name - const char * name (void) const; + const char * name () const; /// return the value - Any_ptr value (void) const; + Any_ptr value () const; /// return the parameter mode flag - Flags flags (void) const; + Flags flags () const; // The pseudo object static methods.. static NamedValue * _duplicate (NamedValue *); - static NamedValue * _nil (void); + static NamedValue * _nil (); // = Reference counting. - ULong _incr_refcount (void); - ULong _decr_refcount (void); + ULong _incr_refcount (); + ULong _decr_refcount (); // Useful for template programming. typedef NamedValue_ptr _ptr_type; @@ -111,20 +107,16 @@ namespace CORBA * Protected destructor to enforce proper memory management * through the reference counting mechanism. */ - ~NamedValue (void); + ~NamedValue (); private: /// private constructor. Cannot be directly instantiated other than /// by its friends. - NamedValue (void); + NamedValue (); private: /// Reference counter. -#if defined (ACE_HAS_CPP11) std::atomic<uint32_t> refcount_; -#else - ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; -#endif /* ACE_HAS_CPP11 */ /// holds the value Any any_; @@ -165,7 +157,7 @@ namespace CORBA public: /// return the current number of elements in the list - ULong count (void) const; + ULong count () const; /// add an element and just initialize the flags NamedValue_ptr add (Flags); @@ -193,11 +185,11 @@ namespace CORBA // The pseudo object static methods.. static NVList * _duplicate (NVList *); - static NVList * _nil (void); + static NVList * _nil (); // = Reference counting. - ULong _incr_refcount (void); - ULong _decr_refcount (void); + ULong _incr_refcount (); + ULong _decr_refcount (); // = TAO Extensions: @@ -223,14 +215,14 @@ namespace CORBA * re-alignment. * It returns ACE_CDR::MAX_ALIGNMENT to indicate errors. */ - ptrdiff_t _tao_target_alignment (void); + ptrdiff_t _tao_target_alignment (); /** * If this list is used by a DII request, this will tell us if * our CDR stream contains any marshaled arguments (needed for * GIOP 1.2). */ - Boolean _lazy_has_arguments (void) const; + Boolean _lazy_has_arguments () const; // Useful for template programming. typedef NVList_ptr _ptr_type; @@ -243,12 +235,12 @@ namespace CORBA * Protected destructor to enforce proper memory management * through the reference counting mechanism. */ - ~NVList (void); + ~NVList (); private: /// Constructor - cannot be instantiated directly other than /// through the CORBA::ORB::create_list method - NVList (void); + NVList (); /// Helper to increase the list size. This is used by all the add_ /// methods of the NVList class @@ -256,7 +248,7 @@ namespace CORBA /// Lazy evaluation routine to fill up the Anys in the NVList from /// the CDR stream. - void evaluate (void); + void evaluate (); private: /// Internal list of parameters stored as NamedValues @@ -266,11 +258,7 @@ namespace CORBA ULong max_; /// Reference counter. -#if defined (ACE_HAS_CPP11) std::atomic<uint32_t> refcount_; -#else - ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; -#endif /* ACE_HAS_CPP11 */ /// Protects the incoming pointer. TAO_SYNCH_MUTEX lock_; diff --git a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp index d170907e390..a9d1940a8df 100644 --- a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp +++ b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp @@ -55,7 +55,7 @@ TAO_NVList_Adapter_Impl::create_named_value (CORBA::NamedValue_ptr &nv) } int -TAO_NVList_Adapter_Impl::Initializer (void) +TAO_NVList_Adapter_Impl::Initializer () { return ACE_Service_Config::process_directive (ace_svc_desc_TAO_NVList_Adapter_Impl); } diff --git a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h index aca4292e926..5ad1d79264e 100644 --- a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h +++ b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h @@ -36,7 +36,7 @@ public: virtual void create_named_value (CORBA::NamedValue_ptr &nv); /// Used to force the initialization of the NVList adapter - static int Initializer (void); + static int Initializer (); }; static int TAO_Requires_NVList_Adapter_Impl_Initializer = diff --git a/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h b/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h index 09b696a606c..6dd3b5e1fa0 100644 --- a/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h +++ b/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h @@ -66,10 +66,10 @@ namespace TAO public: /// No-op reference increment. - void add_ref (void) { } + void add_ref () { } /// No-op reference decrement. - void remove_ref (void) { } + void remove_ref () { } }; diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode.h b/TAO/tao/AnyTypeCode/Objref_TypeCode.h index 59e1abf4e3c..5a43981c0f2 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.h @@ -69,8 +69,8 @@ namespace TAO //@{ virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const; - virtual void tao_duplicate (void); - virtual void tao_release (void); + virtual void tao_duplicate (); + virtual void tao_release (); //@} protected: @@ -86,9 +86,9 @@ namespace TAO //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; - virtual char const * id_i (void) const; - virtual char const * name_i (void) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; + virtual char const * id_i () const; + virtual char const * name_i () const; protected: /// Base attributes (@c id and @c name). diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp index 2502e71169d..9022c9ce878 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp @@ -38,13 +38,13 @@ TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::tao_marshal ( void TAO::TypeCode::Objref<char const *, - TAO::Null_RefCount_Policy>::tao_duplicate (void) + TAO::Null_RefCount_Policy>::tao_duplicate () { } void TAO::TypeCode::Objref<char const *, - TAO::Null_RefCount_Policy>::tao_release (void) + TAO::Null_RefCount_Policy>::tao_release () { } @@ -70,7 +70,7 @@ TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::equivalent_i ( CORBA::TypeCode_ptr TAO::TypeCode::Objref<char const *, - TAO::Null_RefCount_Policy>::get_compact_typecode_i (void) const + TAO::Null_RefCount_Policy>::get_compact_typecode_i () const { TAO_TypeCodeFactory_Adapter * const adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( @@ -116,7 +116,7 @@ TAO::TypeCode::Objref<char const *, char const * TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::id_i ( - void) const + ) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -125,7 +125,7 @@ TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::id_i ( char const * TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::name_i ( - void) const + ) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h index 0887c074809..8166b24edbe 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h @@ -73,8 +73,8 @@ namespace TAO //@{ virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const; - virtual void tao_duplicate (void); - virtual void tao_release (void); + virtual void tao_duplicate (); + virtual void tao_release (); //@} protected: @@ -90,9 +90,9 @@ namespace TAO //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; - virtual char const * id_i (void) const; - virtual char const * name_i (void) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; + virtual char const * id_i () const; + virtual char const * name_i () const; protected: /// Base attributes (@c id and @c name). diff --git a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h index 403529e8650..d8482d33599 100644 --- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h @@ -143,7 +143,7 @@ namespace TAO { public: Reset (CORBA::ULong & flag) : flag_ (flag) { } - ~Reset (void) { this->flag_ = 0; } + ~Reset () { this->flag_ = 0; } private: CORBA::ULong & flag_; }; diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode.h b/TAO/tao/AnyTypeCode/Sequence_TypeCode.h index 9b621ac9bd3..154a4d41742 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode.h @@ -60,8 +60,8 @@ namespace TAO */ //@{ virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const; - virtual void tao_duplicate (void); - virtual void tao_release (void); + virtual void tao_duplicate (); + virtual void tao_release (); //@} protected: @@ -76,9 +76,9 @@ namespace TAO //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; - virtual CORBA::ULong length_i (void) const; - virtual CORBA::TypeCode_ptr content_type_i (void) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; + virtual CORBA::ULong length_i () const; + virtual CORBA::TypeCode_ptr content_type_i () const; private: /// Element type of the sequence. diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp index 99f8e26c3bf..5ef1aec82db 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp @@ -48,13 +48,13 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, void TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, - TAO::Null_RefCount_Policy>::tao_duplicate (void) + TAO::Null_RefCount_Policy>::tao_duplicate () { } void TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, - TAO::Null_RefCount_Policy>::tao_release (void) + TAO::Null_RefCount_Policy>::tao_release () { } @@ -105,7 +105,7 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, CORBA::TypeCode_ptr TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy>::get_compact_typecode_i ( - void) const + ) const { // Already compact since tk_sequence and tk_array TypeCodes have no // name or member names, meaning that we can simply call @@ -126,7 +126,7 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, CORBA::ULong TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy>::length_i ( - void) const + ) const { return this->length_; } @@ -134,7 +134,7 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, CORBA::TypeCode_ptr TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy>::content_type_i ( - void) const + ) const { return CORBA::TypeCode::_duplicate ( diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h index 2750c37ab74..11c76119774 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h @@ -65,8 +65,8 @@ namespace TAO //@{ virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const; - virtual void tao_duplicate (void); - virtual void tao_release (void); + virtual void tao_duplicate (); + virtual void tao_release (); //@} protected: @@ -81,9 +81,9 @@ namespace TAO //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; - virtual CORBA::ULong length_i (void) const; - virtual CORBA::TypeCode_ptr content_type_i ( void) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; + virtual CORBA::ULong length_i () const; + virtual CORBA::TypeCode_ptr content_type_i ( ) const; private: /// Element type of the sequence. diff --git a/TAO/tao/AnyTypeCode/String_TypeCode.h b/TAO/tao/AnyTypeCode/String_TypeCode.h index 507ad7ba137..8ca53f95e6e 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode.h +++ b/TAO/tao/AnyTypeCode/String_TypeCode.h @@ -59,8 +59,8 @@ namespace TAO //@{ virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const; - virtual void tao_duplicate (void); - virtual void tao_release (void); + virtual void tao_duplicate (); + virtual void tao_release (); //@} protected: @@ -75,8 +75,8 @@ namespace TAO //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; - virtual CORBA::ULong length_i (void) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; + virtual CORBA::ULong length_i () const; private: /// Length of the @c string. A length of zero indicates an diff --git a/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp index 90b9344e529..83f28c3add9 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp @@ -24,12 +24,12 @@ TAO::TypeCode::String<TAO::Null_RefCount_Policy>::tao_marshal ( } void -TAO::TypeCode::String<TAO::Null_RefCount_Policy>::tao_duplicate (void) +TAO::TypeCode::String<TAO::Null_RefCount_Policy>::tao_duplicate () { } void -TAO::TypeCode::String<TAO::Null_RefCount_Policy>::tao_release (void) +TAO::TypeCode::String<TAO::Null_RefCount_Policy>::tao_release () { } @@ -57,7 +57,7 @@ TAO::TypeCode::String<TAO::Null_RefCount_Policy>::equivalent_i ( CORBA::TypeCode_ptr TAO::TypeCode::String<TAO::Null_RefCount_Policy>::get_compact_typecode_i ( - void) const + ) const { // Already compact since tk_string and tk_wstring TypeCodes have no // name or member names, meaning that we can simply call @@ -71,7 +71,7 @@ TAO::TypeCode::String<TAO::Null_RefCount_Policy>::get_compact_typecode_i ( CORBA::ULong TAO::TypeCode::String<TAO::Null_RefCount_Policy>::length_i ( - void) const + ) const { return this->length_; } diff --git a/TAO/tao/AnyTypeCode/String_TypeCode_Static.h b/TAO/tao/AnyTypeCode/String_TypeCode_Static.h index 8fb262cb65d..388644be81b 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/String_TypeCode_Static.h @@ -62,8 +62,8 @@ namespace TAO //@{ virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const; - virtual void tao_duplicate (void); - virtual void tao_release (void); + virtual void tao_duplicate (); + virtual void tao_release (); //@} protected: @@ -78,8 +78,8 @@ namespace TAO //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; - virtual CORBA::ULong length_i (void) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; + virtual CORBA::ULong length_i () const; private: /// Length of the @c string. A length of zero indicates an diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode.h b/TAO/tao/AnyTypeCode/Struct_TypeCode.h index 3234062e624..4e5fb375edf 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.h @@ -72,8 +72,8 @@ namespace TAO */ //@{ virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const; - virtual void tao_duplicate (void); - virtual void tao_release (void); + virtual void tao_duplicate (); + virtual void tao_release (); //@} /// Accessor for fields_ @@ -91,10 +91,10 @@ namespace TAO //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; - virtual char const * id_i (void) const; - virtual char const * name_i (void) const; - virtual CORBA::ULong member_count_i (void) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; + virtual char const * id_i () const; + virtual char const * name_i () const; + virtual CORBA::ULong member_count_i () const; virtual char const * member_name_i (CORBA::ULong index) const; virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index) const; //@} diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp index 06aadae7364..fb6853c958e 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp @@ -83,7 +83,7 @@ TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *, - TAO::Null_RefCount_Policy>::tao_duplicate (void) + TAO::Null_RefCount_Policy>::tao_duplicate () { } @@ -92,7 +92,7 @@ TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *, - TAO::Null_RefCount_Policy>::tao_release (void) + TAO::Null_RefCount_Policy>::tao_release () { } @@ -121,8 +121,7 @@ TAO::TypeCode::Struct<char const *, char const * const lhs_name = Traits<char const *>::get_string (lhs_field.name); - char const * const rhs_name = tc->member_name (i - ); + char const * const rhs_name = tc->member_name (i); if (ACE_OS::strcmp (lhs_name, rhs_name) != 0) return false; @@ -182,7 +181,7 @@ TAO::TypeCode::Struct<char const *, TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::get_compact_typecode_i ( - void) const + ) const { ACE_Array_Base<Struct_Field<CORBA::String_var, CORBA::TypeCode_var> > @@ -230,7 +229,7 @@ TAO::TypeCode::Struct<char const *, TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::id_i ( - void) const + ) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -242,7 +241,7 @@ TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *, - TAO::Null_RefCount_Policy>::name_i (void) const + TAO::Null_RefCount_Policy>::name_i () const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -254,7 +253,7 @@ TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *, - TAO::Null_RefCount_Policy>::member_count_i (void) const + TAO::Null_RefCount_Policy>::member_count_i () const { return this->nfields_; } diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h index aa800a6b537..06bbd178928 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h @@ -78,8 +78,8 @@ namespace TAO //@{ virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const; - virtual void tao_duplicate (void); - virtual void tao_release (void); + virtual void tao_duplicate (); + virtual void tao_release (); //@} protected: @@ -94,10 +94,10 @@ namespace TAO //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; - virtual char const * id_i (void) const; - virtual char const * name_i (void) const; - virtual CORBA::ULong member_count_i (void) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; + virtual char const * id_i () const; + virtual char const * name_i () const; + virtual CORBA::ULong member_count_i () const; virtual char const * member_name_i (CORBA::ULong index) const; virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index) const; //@} diff --git a/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp b/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp index 3f25a04ed14..97662a84f02 100644 --- a/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp +++ b/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp @@ -7,7 +7,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO::True_RefCount_Policy::~True_RefCount_Policy (void) +TAO::True_RefCount_Policy::~True_RefCount_Policy () { } diff --git a/TAO/tao/AnyTypeCode/True_RefCount_Policy.h b/TAO/tao/AnyTypeCode/True_RefCount_Policy.h index e1198f14cbe..257032630fc 100644 --- a/TAO/tao/AnyTypeCode/True_RefCount_Policy.h +++ b/TAO/tao/AnyTypeCode/True_RefCount_Policy.h @@ -25,11 +25,7 @@ #include "tao/orbconf.h" #include "ace/Thread_Mutex.h" -#if defined (ACE_HAS_CPP11) -# include <atomic> -#else -# include "ace/Atomic_Op.h" -#endif /* ACE_HAS_CPP11 */ +#include <atomic> TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -75,7 +71,7 @@ namespace TAO public: /// Increase the reference count on this object. - void add_ref (void); + void add_ref (); /// Decrease the reference count on this object. /** @@ -83,7 +79,7 @@ namespace TAO * reference count drops to zero, call @c operator @c delete() * on this object. */ - void remove_ref (void); + void remove_ref (); protected: /// Constructor. @@ -91,7 +87,7 @@ namespace TAO * @note This constructor is protected since it not meant to be * instantiated/used as a standalone object. */ - True_RefCount_Policy (void); + True_RefCount_Policy (); /// Destructor. /** @@ -100,15 +96,11 @@ namespace TAO * zero, i.e. when @c remove_ref() calls @c operator * @c delete @c this. */ - virtual ~True_RefCount_Policy (void); + virtual ~True_RefCount_Policy (); private: /// Reference counter. -#if defined (ACE_HAS_CPP11) std::atomic<uint32_t> refcount_; -#else - ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; -#endif /* ACE_HAS_CPP11 */ }; } // End namespace TAO diff --git a/TAO/tao/AnyTypeCode/TypeCode.cpp b/TAO/tao/AnyTypeCode/TypeCode.cpp index b8277a895cc..53108bd3b91 100644 --- a/TAO/tao/AnyTypeCode/TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode.cpp @@ -13,7 +13,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -CORBA::TypeCode::~TypeCode (void) +CORBA::TypeCode::~TypeCode () { } @@ -113,19 +113,19 @@ CORBA::TypeCode::equivalent (TypeCode_ptr tc) const } char const * -CORBA::TypeCode::id_i (void) const +CORBA::TypeCode::id_i () const { throw ::CORBA::TypeCode::BadKind (); } char const * -CORBA::TypeCode::name_i (void) const +CORBA::TypeCode::name_i () const { throw ::CORBA::TypeCode::BadKind (); } CORBA::ULong -CORBA::TypeCode::member_count_i (void) const +CORBA::TypeCode::member_count_i () const { throw ::CORBA::TypeCode::BadKind (); } @@ -149,37 +149,37 @@ CORBA::TypeCode::member_label_i (CORBA::ULong /* index */) const } CORBA::TypeCode_ptr -CORBA::TypeCode::discriminator_type_i (void) const +CORBA::TypeCode::discriminator_type_i () const { throw ::CORBA::TypeCode::BadKind (); } CORBA::Long -CORBA::TypeCode::default_index_i (void) const +CORBA::TypeCode::default_index_i () const { throw ::CORBA::TypeCode::BadKind (); } CORBA::ULong -CORBA::TypeCode::length_i (void) const +CORBA::TypeCode::length_i () const { throw ::CORBA::TypeCode::BadKind (); } CORBA::TypeCode_ptr -CORBA::TypeCode::content_type_i (void) const +CORBA::TypeCode::content_type_i () const { throw ::CORBA::TypeCode::BadKind (); } CORBA::UShort -CORBA::TypeCode::fixed_digits_i (void) const +CORBA::TypeCode::fixed_digits_i () const { throw ::CORBA::TypeCode::BadKind (); } CORBA::UShort -CORBA::TypeCode::fixed_scale_i (void) const +CORBA::TypeCode::fixed_scale_i () const { throw ::CORBA::TypeCode::BadKind (); } @@ -191,20 +191,20 @@ CORBA::TypeCode::member_visibility_i (CORBA::ULong /* index */) const } CORBA::ValueModifier -CORBA::TypeCode::type_modifier_i (void) const +CORBA::TypeCode::type_modifier_i () const { throw ::CORBA::TypeCode::BadKind (); } CORBA::TypeCode_ptr -CORBA::TypeCode::concrete_base_type_i (void) const +CORBA::TypeCode::concrete_base_type_i () const { throw ::CORBA::TypeCode::BadKind (); } // --------------------------------------------------------------- -CORBA::TypeCode::Bounds::Bounds (void) +CORBA::TypeCode::Bounds::Bounds () : CORBA::UserException ("IDL:omg.org/CORBA/TypeCode/Bounds:1.0", "Bounds") { @@ -217,7 +217,7 @@ CORBA::TypeCode::Bounds::_downcast (CORBA::Exception *ex) } CORBA::Exception * -CORBA::TypeCode::Bounds::_alloc (void) +CORBA::TypeCode::Bounds::_alloc () { CORBA::Exception *retval = 0; ACE_NEW_RETURN (retval, ::CORBA::TypeCode::Bounds, 0); @@ -225,7 +225,7 @@ CORBA::TypeCode::Bounds::_alloc (void) } CORBA::Exception * -CORBA::TypeCode::Bounds::_tao_duplicate (void) const +CORBA::TypeCode::Bounds::_tao_duplicate () const { CORBA::Exception *result; ACE_NEW_RETURN (result, @@ -235,7 +235,7 @@ CORBA::TypeCode::Bounds::_tao_duplicate (void) const } void -CORBA::TypeCode::Bounds::_raise (void) const +CORBA::TypeCode::Bounds::_raise () const { throw *this; } @@ -258,7 +258,7 @@ CORBA::TypeCode::Bounds::_tao_decode (TAO_InputCDR &) // **************************************************************** -CORBA::TypeCode::BadKind::BadKind (void) +CORBA::TypeCode::BadKind::BadKind () : CORBA::UserException ("IDL:omg.org/CORBA/TypeCode/BadKind:1.0", "BadKind") { @@ -271,7 +271,7 @@ CORBA::TypeCode::BadKind::_downcast (CORBA::Exception *ex) } CORBA::Exception * -CORBA::TypeCode::BadKind::_tao_duplicate (void) const +CORBA::TypeCode::BadKind::_tao_duplicate () const { CORBA::Exception *result = 0; ACE_NEW_RETURN (result, @@ -281,7 +281,7 @@ CORBA::TypeCode::BadKind::_tao_duplicate (void) const } void -CORBA::TypeCode::BadKind::_raise (void) const +CORBA::TypeCode::BadKind::_raise () const { throw *this; } @@ -402,7 +402,7 @@ namespace TAO } CORBA::TypeCode_ptr - Objref_Traits<CORBA::TypeCode>::nil (void) + Objref_Traits<CORBA::TypeCode>::nil () { return CORBA::TypeCode::_nil (); } diff --git a/TAO/tao/AnyTypeCode/TypeCode.h b/TAO/tao/AnyTypeCode/TypeCode.h index d7701ab1c50..9a21085a314 100644 --- a/TAO/tao/AnyTypeCode/TypeCode.h +++ b/TAO/tao/AnyTypeCode/TypeCode.h @@ -70,14 +70,14 @@ namespace CORBA public: /// Constructor. - Bounds (void); + Bounds (); static Bounds * _downcast (CORBA::Exception * ex); - static CORBA::Exception * _alloc (void); + static CORBA::Exception * _alloc (); - virtual CORBA::Exception * _tao_duplicate (void) const; + virtual CORBA::Exception * _tao_duplicate () const; - virtual void _raise (void) const; + virtual void _raise () const; virtual void _tao_encode (TAO_OutputCDR & cdr) const; virtual void _tao_decode (TAO_InputCDR & cdr); @@ -96,14 +96,14 @@ namespace CORBA { public: - BadKind (void); + BadKind (); static BadKind * _downcast (CORBA::Exception * ex); - static CORBA::Exception * _alloc (void); + static CORBA::Exception * _alloc (); - virtual CORBA::Exception * _tao_duplicate (void) const; + virtual CORBA::Exception * _tao_duplicate () const; - virtual void _raise (void) const; + virtual void _raise () const; virtual void _tao_encode (TAO_OutputCDR & cdr) const; virtual void _tao_decode (TAO_InputCDR & cdr); @@ -123,7 +123,7 @@ namespace CORBA static CORBA::TypeCode_ptr _duplicate (CORBA::TypeCode_ptr tc); /// Returns a NULL typecode. - static CORBA::TypeCode_ptr _nil (void); + static CORBA::TypeCode_ptr _nil (); /** * @name @c CORBA::TypeCode Methods @@ -158,7 +158,7 @@ namespace CORBA Boolean equivalent (TypeCode_ptr tc) const; /// The kind of @c TypeCode. - TCKind kind (void) const; + TCKind kind () const; /// Return @c TypeCode stripped of optional @c name and /// @c member_name fields. @@ -180,7 +180,7 @@ namespace CORBA * the TAO_IDL compiler by invoking it with its "-Gt" * (i.e. enable optimized TypeCodes) command line option. */ - TypeCode_ptr get_compact_typecode (void) const; + TypeCode_ptr get_compact_typecode () const; /// The @c RepositoryId globally identifying the type. /** @@ -206,7 +206,7 @@ namespace CORBA * is required by the C++ mapping. In particular, ownership * is maintained by the @c TypeCode. */ - char const * id (void) const; + char const * id () const; /// The simple name identifying the type within its enclosing /// scope. @@ -233,7 +233,7 @@ namespace CORBA * behavior is required by the C++ mapping. In particular, * ownership is maintained by the @c TypeCode. */ - char const * name (void) const; + char const * name () const; /// The type member count. /** @@ -246,7 +246,7 @@ namespace CORBA * @li @c tk_except * @li @c tk_event */ - ULong member_count (void) const; + ULong member_count () const; /// The type member name. /** @@ -292,7 +292,7 @@ namespace CORBA * * @li @c tk_union */ - TypeCode_ptr discriminator_type (void) const; + TypeCode_ptr discriminator_type () const; /// The index of the default union member. /** @@ -300,7 +300,7 @@ namespace CORBA * * @li @c tk_union */ - Long default_index (void) const; + Long default_index () const; /// The length of the type. /** @@ -311,7 +311,7 @@ namespace CORBA * @li @c tk_sequence * @li @c tk_array */ - ULong length (void) const; + ULong length () const; /// The underlying content type. /** @@ -322,7 +322,7 @@ namespace CORBA * @li @c tk_value_box * @li @c tk_alias */ - TypeCode_ptr content_type (void) const; + TypeCode_ptr content_type () const; /// The number of significant digits. /** @@ -330,7 +330,7 @@ namespace CORBA * * @li @c tk_fixed */ - UShort fixed_digits (void) const; + UShort fixed_digits () const; /// The scale factor. /** @@ -338,7 +338,7 @@ namespace CORBA * * @li @c tk_fixed */ - UShort fixed_scale (void) const; + UShort fixed_scale () const; /// The @c Visibility of the @c valuetype or @c eventtype member /// corresponding to index @a index. @@ -358,7 +358,7 @@ namespace CORBA * @li @c tk_value * @li @c tk_event */ - ValueModifier type_modifier (void) const; + ValueModifier type_modifier () const; /// The @c TypeCode corresponding to the concrete base /// @c valuetype or @c eventtype. @@ -372,7 +372,7 @@ namespace CORBA * @c valuetype or @c eventtype. * @c CORBA::TypeCode::_nil() if no concrete base exists. */ - TypeCode_ptr concrete_base_type (void) const; + TypeCode_ptr concrete_base_type () const; //@} /// Marshal the @c TypeCode @c TCKind. @@ -411,10 +411,10 @@ namespace CORBA CORBA::ULong offset) const = 0; /// Increase the reference count on this @c TypeCode. - virtual void tao_duplicate (void) = 0; + virtual void tao_duplicate () = 0; /// Decrease the reference count on this object. - virtual void tao_release (void) = 0; + virtual void tao_release () = 0; /// Destruction callback for Anys. static void _tao_any_destructor (void * x); @@ -432,7 +432,7 @@ namespace CORBA * Protected destructor to enforce proper memory management * through the reference counting mechanism. */ - virtual ~TypeCode (void); + virtual ~TypeCode (); /** * @name @c TypeCode Template Methods @@ -453,23 +453,23 @@ namespace CORBA //@{ virtual Boolean equal_i (TypeCode_ptr tc) const = 0; virtual Boolean equivalent_i (TypeCode_ptr tc) const = 0; - virtual TypeCode_ptr get_compact_typecode_i (void) const = 0; + virtual TypeCode_ptr get_compact_typecode_i () const = 0; - virtual char const * id_i (void) const; - virtual char const * name_i (void) const; - virtual ULong member_count_i (void) const; + virtual char const * id_i () const; + virtual char const * name_i () const; + virtual ULong member_count_i () const; virtual char const * member_name_i (ULong index) const; virtual TypeCode_ptr member_type_i (ULong index) const; virtual Any * member_label_i (ULong index) const; - virtual TypeCode_ptr discriminator_type_i (void) const; - virtual Long default_index_i (void) const; - virtual ULong length_i (void) const; - virtual TypeCode_ptr content_type_i (void) const; - virtual UShort fixed_digits_i (void) const; - virtual UShort fixed_scale_i (void) const; + virtual TypeCode_ptr discriminator_type_i () const; + virtual Long default_index_i () const; + virtual ULong length_i () const; + virtual TypeCode_ptr content_type_i () const; + virtual UShort fixed_digits_i () const; + virtual UShort fixed_scale_i () const; virtual Visibility member_visibility_i (ULong index) const; - virtual ValueModifier type_modifier_i (void) const; - virtual TypeCode_ptr concrete_base_type_i (void) const; + virtual ValueModifier type_modifier_i () const; + virtual TypeCode_ptr concrete_base_type_i () const; //@} private: @@ -549,7 +549,7 @@ namespace TAO { static ::CORBA::TypeCode_ptr duplicate (::CORBA::TypeCode_ptr); static void release (::CORBA::TypeCode_ptr); - static ::CORBA::TypeCode_ptr nil (void); + static ::CORBA::TypeCode_ptr nil (); static CORBA::Boolean marshal (::CORBA::TypeCode_ptr p, TAO_OutputCDR & cdr); }; diff --git a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h index 1616339555c..193de495ea3 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h @@ -51,11 +51,11 @@ namespace TAO Base_Attributes (char const * id); /// Get the @c RepositoryId globally identifying the type. - char const * id (void) const; + char const * id () const; /// Get the simple name identifying the type within its /// enclosing scope. - char const * name (void) const; + char const * name () const; /// Set the simple name identifying the type within its /// enclosing scope. diff --git a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp index b3d656e61cb..e80e1c653a4 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp @@ -44,7 +44,7 @@ namespace TAO struct TC_Info { /// Constructor. - TC_Info (void) : id (0), type () {} + TC_Info () : id (0), type () {} /// Repository ID. char const * id; diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp index 32f411cb9e5..f383c79659d 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp @@ -18,13 +18,11 @@ TAO::TypeCode::Case<StringType, TypeCodeType>::~Case (void) template <typename StringType, typename TypeCodeType> bool TAO::TypeCode::Case<StringType, TypeCodeType>::equal (CORBA::ULong index, - CORBA::TypeCode_ptr tc - ) const + CORBA::TypeCode_ptr tc) const { // Check case names. char const * const lhs_name = this->name (); - char const * const rhs_name = tc->member_name (index - ); + char const * const rhs_name = tc->member_name (index); if (ACE_OS::strcmp (lhs_name, rhs_name) != 0) return false; @@ -32,49 +30,40 @@ TAO::TypeCode::Case<StringType, TypeCodeType>::equal (CORBA::ULong index, // Check case TypeCodes. CORBA::TypeCode_ptr const lhs_tc = this->type (); CORBA::TypeCode_var const rhs_tc = - tc->member_type (index - ); + tc->member_type (index); CORBA::Boolean const equal_members = - lhs_tc->equal (rhs_tc.in () - ); + lhs_tc->equal (rhs_tc.in ()); if (!equal_members) return false; // Check case label. - return this->equal_label (index, - tc - ); + return this->equal_label (index, tc); } template <typename StringType, typename TypeCodeType> bool TAO::TypeCode::Case<StringType, TypeCodeType>::equivalent ( CORBA::ULong index, - CORBA::TypeCode_ptr tc - ) const + CORBA::TypeCode_ptr tc) const { // Member names are ignore when determining equivalence. // Check case TypeCodes. CORBA::TypeCode_ptr const lhs_tc = this->type (); CORBA::TypeCode_var const rhs_tc = - tc->member_type (index - ); + tc->member_type (index); CORBA::Boolean const equivalent_members = - lhs_tc->equivalent (rhs_tc.in () - ); + lhs_tc->equivalent (rhs_tc.in ()); if (!equivalent_members) return 0; // Check case label. // The label must be equal when determining equivalence, too. - return this->equal_label (index, - tc - ); + return this->equal_label (index, tc); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h index da96f1360cd..1e420b17592 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h @@ -60,20 +60,20 @@ namespace TAO /** * Constructor used when creating dynamic @c union @c TypeCodes. */ - Case (void); + Case (); /// Destructor. - virtual ~Case (void); + virtual ~Case (); /// Cloning/copying operation. - virtual Case * clone (void) const = 0; + virtual Case * clone () const = 0; /// Return the IDL @c union case label value embedded within a /// @c CORBA::Any. - virtual CORBA::Any * label (void) const = 0; + virtual CORBA::Any * label () const = 0; /// Get the name of the @c union case/member. - char const * name (void) const; + char const * name () const; /// Set the name of the @c union case/member. void name (char const * the_name); @@ -83,7 +83,7 @@ namespace TAO * @note The reference count is not manipulated by this method, * i.e., ownership is retained by this class. */ - CORBA::TypeCode_ptr type (void) const; + CORBA::TypeCode_ptr type () const; /// Set the @c CORBA::TypeCode of the @c union case/member. /** diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h index de360a3cdcb..b44435db95f 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h @@ -71,8 +71,8 @@ namespace TAO * @see @c TAO::TypeCode::Case */ //@{ - Case<StringType, TypeCodeType> * clone (void) const; - virtual CORBA::Any * label (void) const; + Case<StringType, TypeCodeType> * clone () const; + virtual CORBA::Any * label () const; virtual bool marshal_label (TAO_OutputCDR & cdr) const; virtual bool equal_label (CORBA::ULong index, CORBA::TypeCode_ptr tc) const; diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp b/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp index 86219d92c73..faf3d0745af 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp @@ -112,8 +112,7 @@ bool TAO::TypeCode::Case_T<DiscriminatorType, StringType, TypeCodeType>::equal_label (CORBA::ULong index, - CORBA::TypeCode_ptr tc - ) const + CORBA::TypeCode_ptr tc) const { CORBA::Any_var const any = tc->member_label (index); diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_T.h index d6ab4a1ab36..973edcffb32 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.h @@ -108,8 +108,8 @@ namespace TAO * @see @c TAO::TypeCode::Case */ //@{ - Case<StringType, TypeCodeType> * clone (void) const; - virtual CORBA::Any * label (void) const; + Case<StringType, TypeCodeType> * clone () const; + virtual CORBA::Any * label () const; virtual bool marshal_label (TAO_OutputCDR & cdr) const; virtual bool equal_label (CORBA::ULong index, CORBA::TypeCode_ptr tc) const; diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.cpp b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp index accfab8d9d9..6a6a6b145b9 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp @@ -254,8 +254,7 @@ TAO::TypeCode::Union<StringType, // // the compact TypeCode. // tc_cases[i].name = empty_name; // tc_cases[i].type = -// this->cases_[i]->type ()->get_compact_typecode ( -// ); +// this->cases_[i]->type ()->get_compact_typecode (); // } // } diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.h b/TAO/tao/AnyTypeCode/Union_TypeCode.h index 31855ed90a4..99cc7cf771a 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Union_TypeCode.h @@ -76,12 +76,12 @@ namespace TAO //@{ virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const; - virtual void tao_duplicate (void); - virtual void tao_release (void); + virtual void tao_duplicate (); + virtual void tao_release (); //@} /// Accessor for cases_ - const CaseArrayType& cases(void) const; + const CaseArrayType& cases() const; protected: /** @@ -94,15 +94,15 @@ namespace TAO //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; - virtual char const * id_i (void) const; - virtual char const * name_i (void) const; - virtual CORBA::ULong member_count_i (void) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; + virtual char const * id_i () const; + virtual char const * name_i () const; + virtual CORBA::ULong member_count_i () const; virtual char const * member_name_i (CORBA::ULong index) const; virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index) const; virtual CORBA::Any * member_label_i (CORBA::ULong index) const; - virtual CORBA::TypeCode_ptr discriminator_type_i (void) const; - virtual CORBA::Long default_index_i (void) const; + virtual CORBA::TypeCode_ptr discriminator_type_i () const; + virtual CORBA::Long default_index_i () const; //@} protected: diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp index b3bb39e4aac..d702bec5bfc 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp @@ -78,7 +78,7 @@ TAO::TypeCode::Union<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const *, - TAO::Null_RefCount_Policy>::tao_duplicate (void) + TAO::Null_RefCount_Policy>::tao_duplicate () { } @@ -87,7 +87,7 @@ TAO::TypeCode::Union<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const *, - TAO::Null_RefCount_Policy>::tao_release (void) + TAO::Null_RefCount_Policy>::tao_release () { } @@ -198,7 +198,7 @@ TAO::TypeCode::Union<char const *, TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const *, TAO::Null_RefCount_Policy>::get_compact_typecode_i ( - void) const + ) const { // typedef ACE::Value_Ptr<TAO::TypeCode::Case<CORBA::String_var, // CORBA::TypeCode_var> > elem_type; @@ -218,8 +218,7 @@ TAO::TypeCode::Union<char const *, // // the compact TypeCode. // tc_cases[i].name = empty_name; // tc_cases[i].type = -// this->cases_[i]->type ()->get_compact_typecode ( -// ); +// this->cases_[i]->type ()->get_compact_typecode (); // } // } @@ -254,7 +253,7 @@ TAO::TypeCode::Union<char const *, TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const *, TAO::Null_RefCount_Policy>::id_i ( - void) const + ) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -266,7 +265,7 @@ TAO::TypeCode::Union<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const *, - TAO::Null_RefCount_Policy>::name_i (void) const + TAO::Null_RefCount_Policy>::name_i () const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -278,7 +277,7 @@ TAO::TypeCode::Union<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const *, - TAO::Null_RefCount_Policy>::member_count_i (void) const + TAO::Null_RefCount_Policy>::member_count_i () const { return this->ncases_; } @@ -353,7 +352,7 @@ TAO::TypeCode::Union<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const *, - TAO::Null_RefCount_Policy>::discriminator_type_i (void) const + TAO::Null_RefCount_Policy>::discriminator_type_i () const { return CORBA::TypeCode::_duplicate ( @@ -365,7 +364,7 @@ TAO::TypeCode::Union<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const *, - TAO::Null_RefCount_Policy>::default_index_i (void) const + TAO::Null_RefCount_Policy>::default_index_i () const { return this->default_index_; } diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h index 180747f1428..e624fcbece0 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h @@ -80,8 +80,8 @@ namespace TAO //@{ virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const; - virtual void tao_duplicate (void); - virtual void tao_release (void); + virtual void tao_duplicate (); + virtual void tao_release (); //@} protected: @@ -95,15 +95,15 @@ namespace TAO //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; - virtual char const * id_i (void) const; - virtual char const * name_i (void) const; - virtual CORBA::ULong member_count_i (void) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; + virtual char const * id_i () const; + virtual char const * name_i () const; + virtual CORBA::ULong member_count_i () const; virtual char const * member_name_i (CORBA::ULong index) const; virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index) const; virtual CORBA::Any * member_label_i (CORBA::ULong index) const; - virtual CORBA::TypeCode_ptr discriminator_type_i (void) const; - virtual CORBA::Long default_index_i (void) const; + virtual CORBA::TypeCode_ptr discriminator_type_i () const; + virtual CORBA::Long default_index_i () const; //@} private: diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp index a720506dc0b..e19f8a95c33 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp @@ -162,8 +162,7 @@ TAO::TypeCode::Value<StringType, tc->concrete_base_type (); CORBA::Boolean const equal_concrete_base_types = - this->equal (rhs_concrete_base_type.in () - ); + this->equal (rhs_concrete_base_type.in ()); if (!equal_concrete_base_types) return false; @@ -180,9 +179,7 @@ TAO::TypeCode::Value<StringType, this->fields_[i]; CORBA::Visibility const lhs_visibility = lhs_field.visibility; - CORBA::Visibility const rhs_visibility = - tc->member_visibility (i - ); + CORBA::Visibility const rhs_visibility = tc->member_visibility (i); if (lhs_visibility != rhs_visibility) return false; @@ -262,8 +259,7 @@ TAO::TypeCode::Value<StringType, tc->member_type (i); CORBA::Boolean const equiv_types = - lhs_tc->equivalent (rhs_tc.in () - ); + lhs_tc->equivalent (rhs_tc.in ()); if (!equiv_types) return false; @@ -300,8 +296,7 @@ TAO::TypeCode::Value<StringType, tc_fields[i].name = empty_name; tc_fields[i].type = Traits<StringType>::get_typecode ( - this->fields_[i].type)->get_compact_typecode ( - ); + this->fields_[i].type)->get_compact_typecode (); tc_fields[i].visibility = this->fields_[i].visibility; } } diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.h b/TAO/tao/AnyTypeCode/Value_TypeCode.h index c454d0cbe1a..836403fd08d 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Value_TypeCode.h @@ -76,12 +76,12 @@ namespace TAO //@{ virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const; - virtual void tao_duplicate (void); - virtual void tao_release (void); + virtual void tao_duplicate (); + virtual void tao_release (); //@} /// Accessor for concrete_base_ - const TypeCodeType& concrete_base(void) const; + const TypeCodeType& concrete_base() const; /// Accessor for fields_ const FieldArrayType& fields() const; @@ -98,15 +98,15 @@ namespace TAO //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; - virtual char const * id_i (void) const; - virtual char const * name_i (void) const; - virtual CORBA::ULong member_count_i (void) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; + virtual char const * id_i () const; + virtual char const * name_i () const; + virtual CORBA::ULong member_count_i () const; virtual char const * member_name_i (CORBA::ULong index) const; virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index) const; virtual CORBA::Visibility member_visibility_i (CORBA::ULong index) const; - virtual CORBA::ValueModifier type_modifier_i (void) const; - virtual CORBA::TypeCode_ptr concrete_base_type_i (void) const; + virtual CORBA::ValueModifier type_modifier_i () const; + virtual CORBA::TypeCode_ptr concrete_base_type_i () const; //@} protected: diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp index 6bff91a30bc..54d40980a78 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp @@ -87,7 +87,7 @@ TAO::TypeCode::Value<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> const *, - TAO::Null_RefCount_Policy>::tao_duplicate (void) + TAO::Null_RefCount_Policy>::tao_duplicate () { } @@ -96,7 +96,7 @@ TAO::TypeCode::Value<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> const *, - TAO::Null_RefCount_Policy>::tao_release (void) + TAO::Null_RefCount_Policy>::tao_release () { } @@ -224,7 +224,7 @@ TAO::TypeCode::Value<char const *, TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::get_compact_typecode_i ( - void) const + ) const { ACE_Array_Base<Value_Field<CORBA::String_var, CORBA::TypeCode_var> > tc_fields (this->nfields_); @@ -244,8 +244,7 @@ TAO::TypeCode::Value<char const *, tc_fields[i].name = empty_name; tc_fields[i].type = Traits<char const *>::get_typecode ( - this->fields_[i].type)->get_compact_typecode ( - ); + this->fields_[i].type)->get_compact_typecode (); tc_fields[i].visibility = this->fields_[i].visibility; } } @@ -276,7 +275,7 @@ TAO::TypeCode::Value<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> const *, - TAO::Null_RefCount_Policy>::id_i (void) const + TAO::Null_RefCount_Policy>::id_i () const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -288,7 +287,7 @@ TAO::TypeCode::Value<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> const *, - TAO::Null_RefCount_Policy>::name_i (void) const + TAO::Null_RefCount_Policy>::name_i () const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -300,7 +299,7 @@ TAO::TypeCode::Value<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> const *, - TAO::Null_RefCount_Policy>::member_count_i (void) const + TAO::Null_RefCount_Policy>::member_count_i () const { return this->nfields_; } @@ -356,7 +355,7 @@ TAO::TypeCode::Value<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> const *, - TAO::Null_RefCount_Policy>::type_modifier_i (void) const + TAO::Null_RefCount_Policy>::type_modifier_i () const { return this->type_modifier_; } @@ -367,7 +366,7 @@ TAO::TypeCode::Value<char const *, TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::concrete_base_type_i ( - void) const + ) const { return CORBA::TypeCode::_duplicate ( diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h index b159728edb8..e269498b648 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h @@ -79,8 +79,8 @@ namespace TAO */ //@{ virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const; - virtual void tao_duplicate (void); - virtual void tao_release (void); + virtual void tao_duplicate (); + virtual void tao_release (); //@} protected: @@ -95,15 +95,15 @@ namespace TAO //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; - virtual char const * id_i (void) const; - virtual char const * name_i (void) const; - virtual CORBA::ULong member_count_i (void) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; + virtual char const * id_i () const; + virtual char const * name_i () const; + virtual CORBA::ULong member_count_i () const; virtual char const * member_name_i (CORBA::ULong index) const; virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index) const; virtual CORBA::Visibility member_visibility_i (CORBA::ULong index) const; - virtual CORBA::ValueModifier type_modifier_i (void) const; - virtual CORBA::TypeCode_ptr concrete_base_type_i (void) const; + virtual CORBA::ValueModifier type_modifier_i () const; + virtual CORBA::TypeCode_ptr concrete_base_type_i () const; //@} private: diff --git a/TAO/tao/AnyTypeCode/append.cpp b/TAO/tao/AnyTypeCode/append.cpp index 0ae018b16e5..69d88d32aba 100644 --- a/TAO/tao/AnyTypeCode/append.cpp +++ b/TAO/tao/AnyTypeCode/append.cpp @@ -586,8 +586,7 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc, tc->member_type (current_member); return TAO_Marshal_Object::perform_append (member_tc.in (), src, - dest - ); + dest); } TAO::traverse_status @@ -809,8 +808,7 @@ TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr tc, { retval = TAO_Marshal_Object::perform_append (tc2.in (), src, - dest - ); + dest); } break; }// end of switch @@ -996,8 +994,7 @@ TAO_Marshal_Array::append (CORBA::TypeCode_ptr tc, { retval = TAO_Marshal_Object::perform_append (tc2.in (), src, - dest - ); + dest); } break; }// end of switch @@ -1050,8 +1047,7 @@ TAO_Marshal_Alias::append (CORBA::TypeCode_ptr tc, TAO::traverse_status TAO_Marshal_Except::append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, - TAO_OutputCDR *dest - ) + TAO_OutputCDR *dest) { TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE; @@ -1092,8 +1088,7 @@ TAO_Marshal_Except::append (CORBA::TypeCode_ptr tc, TAO::traverse_status TAO_Marshal_WString::append (CORBA::TypeCode_ptr, TAO_InputCDR *src, - TAO_OutputCDR *dest - ) + TAO_OutputCDR *dest) { CORBA::Boolean continue_append = true; @@ -1120,8 +1115,7 @@ TAO_Marshal_WString::append (CORBA::TypeCode_ptr, TAO::traverse_status TAO_Marshal_Value::append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, - TAO_OutputCDR *dest - ) + TAO_OutputCDR *dest) { TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE; @@ -1181,8 +1175,7 @@ TAO_Marshal_Value::append (CORBA::TypeCode_ptr tc, param = tc->content_type (); retval = TAO_Marshal_Object::perform_append (param.in (), src, - dest - ); + dest); } else // tc->kind () must be tk_value or tk_event { @@ -1192,8 +1185,7 @@ TAO_Marshal_Value::append (CORBA::TypeCode_ptr tc, { retval = this->append (param.in (), src, - dest - ); + dest); } if (retval == TAO::TRAVERSE_CONTINUE) @@ -1212,8 +1204,7 @@ TAO_Marshal_Value::append (CORBA::TypeCode_ptr tc, retval = TAO_Marshal_Object::perform_append (param.in (), src, - dest - ); + dest); } } } diff --git a/TAO/tao/AnyTypeCode_Adapter.cpp b/TAO/tao/AnyTypeCode_Adapter.cpp index 325f0fd6a1c..e06af880abb 100644 --- a/TAO/tao/AnyTypeCode_Adapter.cpp +++ b/TAO/tao/AnyTypeCode_Adapter.cpp @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_AnyTypeCode_Adapter::~TAO_AnyTypeCode_Adapter (void) +TAO_AnyTypeCode_Adapter::~TAO_AnyTypeCode_Adapter () { } diff --git a/TAO/tao/AnyTypeCode_Adapter.h b/TAO/tao/AnyTypeCode_Adapter.h index 395fdb7df83..e7e793c952c 100644 --- a/TAO/tao/AnyTypeCode_Adapter.h +++ b/TAO/tao/AnyTypeCode_Adapter.h @@ -62,7 +62,7 @@ class TAO_Export TAO_AnyTypeCode_Adapter : public ACE_Service_Object { public: - virtual ~TAO_AnyTypeCode_Adapter (void); + virtual ~TAO_AnyTypeCode_Adapter (); #define ANYTYPECODE__EXCEPTION_LIST \ TAO_SYSTEM_EXCEPTION (UNKNOWN) \ diff --git a/TAO/tao/Argument.cpp b/TAO/tao/Argument.cpp index 0125be2ffea..fab7b1d7514 100644 --- a/TAO/tao/Argument.cpp +++ b/TAO/tao/Argument.cpp @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO::Argument::~Argument (void) +TAO::Argument::~Argument () { } @@ -22,7 +22,7 @@ TAO::Argument::demarshal (TAO_InputCDR &) TAO::Argument * TAO::Argument::clone () { - return 0; + return nullptr; } #if TAO_HAS_INTERCEPTORS == 1 @@ -33,25 +33,25 @@ TAO::Argument::interceptor_value (CORBA::Any *) const } CORBA::ParameterMode -TAO::InArgument::mode (void) const +TAO::InArgument::mode () const { return CORBA::PARAM_IN; } CORBA::ParameterMode -TAO::InoutArgument::mode (void) const +TAO::InoutArgument::mode () const { return CORBA::PARAM_INOUT; } CORBA::ParameterMode -TAO::OutArgument::mode (void) const +TAO::OutArgument::mode () const { return CORBA::PARAM_OUT; } CORBA::ParameterMode -TAO::RetArgument::mode (void) const +TAO::RetArgument::mode () const { return CORBA::PARAM_OUT; } @@ -59,12 +59,12 @@ TAO::RetArgument::mode (void) const #endif /* TAO_HAS_INTERCEPTORS */ TAO::Argument * -TAO::Void_Return_Argument::clone (void) +TAO::Void_Return_Argument::clone () { - TAO::Argument *clone_arg = 0; + TAO::Argument *clone_arg = nullptr; ACE_NEW_RETURN (clone_arg, Void_Return_Argument (), - 0); + nullptr); return clone_arg; } diff --git a/TAO/tao/Argument.h b/TAO/tao/Argument.h index 96b084c29b5..f47baa2a74f 100644 --- a/TAO/tao/Argument.h +++ b/TAO/tao/Argument.h @@ -51,7 +51,7 @@ namespace TAO public: /// Destructor. - virtual ~Argument (void); + virtual ~Argument (); /// Marshal the argument into the given CDR output stream. /** @@ -66,7 +66,7 @@ namespace TAO virtual CORBA::Boolean demarshal (TAO_InputCDR &); /// Template method to clone a TAO Argument - virtual Argument* clone (void); + virtual Argument* clone (); #if TAO_HAS_INTERCEPTORS == 1 @@ -86,7 +86,7 @@ namespace TAO virtual void interceptor_value (CORBA::Any *) const; /// Get the parameter mode of this argument - virtual CORBA::ParameterMode mode (void) const = 0; + virtual CORBA::ParameterMode mode () const = 0; //@} #endif /* TAO_HAS_INTERCEPTORS == 1 */ @@ -97,7 +97,7 @@ namespace TAO class TAO_Export InArgument : public Argument { public: - virtual CORBA::ParameterMode mode (void) const; + virtual CORBA::ParameterMode mode () const; }; #else typedef Argument InArgument; @@ -107,7 +107,7 @@ namespace TAO class TAO_Export InoutArgument : public Argument { public: - virtual CORBA::ParameterMode mode (void) const; + virtual CORBA::ParameterMode mode () const; }; #else typedef Argument InoutArgument; @@ -117,7 +117,7 @@ namespace TAO class TAO_Export OutArgument : public Argument { public: - virtual CORBA::ParameterMode mode (void) const; + virtual CORBA::ParameterMode mode () const; }; #else typedef Argument OutArgument; @@ -127,7 +127,7 @@ namespace TAO class TAO_Export RetArgument : public Argument { public: - virtual CORBA::ParameterMode mode (void) const; + virtual CORBA::ParameterMode mode () const; }; #else typedef Argument RetArgument; @@ -136,7 +136,7 @@ namespace TAO class TAO_Export Void_Return_Argument : public RetArgument { public: - virtual Argument* clone (void); + virtual Argument* clone (); }; } diff --git a/TAO/tao/Array_Traits_T.h b/TAO/tao/Array_Traits_T.h index 086cd3eacc1..33a79646a44 100644 --- a/TAO/tao/Array_Traits_T.h +++ b/TAO/tao/Array_Traits_T.h @@ -37,7 +37,7 @@ struct array_traits TAO::Array_Traits<forany_type>::free (value); } - inline static slice_type * alloc (void) + inline static slice_type * alloc () { return TAO::Array_Traits<forany_type>::alloc (); } diff --git a/TAO/tao/Array_VarOut_T.cpp b/TAO/tao/Array_VarOut_T.cpp index c898e7a09fd..49c04124aea 100644 --- a/TAO/tao/Array_VarOut_T.cpp +++ b/TAO/tao/Array_VarOut_T.cpp @@ -28,8 +28,7 @@ TAO_FixedArray_Var_T<T,T_slice,TAG>::operator= (T_slice * p) template<typename T, typename T_slice, typename TAG> TAO_FixedArray_Var_T<T,T_slice,TAG> & TAO_FixedArray_Var_T<T,T_slice,TAG>::operator= ( - const TAO_FixedArray_Var_T<T,T_slice,TAG> & p - ) + const TAO_FixedArray_Var_T<T,T_slice,TAG> & p) { if (this != &p) { @@ -62,8 +61,7 @@ TAO_VarArray_Var_T<T,T_slice,TAG>::operator= (T_slice * p) template<typename T, typename T_slice, typename TAG> TAO_VarArray_Var_T<T,T_slice,TAG> & TAO_VarArray_Var_T<T,T_slice,TAG>::operator= ( - const TAO_VarArray_Var_T<T,T_slice,TAG> & p - ) + const TAO_VarArray_Var_T<T,T_slice,TAG> & p) { if (this != &p) { @@ -81,8 +79,7 @@ TAO_VarArray_Var_T<T,T_slice,TAG>::operator= ( template<typename T, typename T_slice, typename TAG> void TAO_Array_Forany_T<T,T_slice,TAG>::_tao_any_destructor ( - void * _tao_void_pointer - ) + void * _tao_void_pointer) { T_slice * tmp = static_cast<T_slice *> (_tao_void_pointer); TAO::Array_Traits<FORANY>::free (tmp); diff --git a/TAO/tao/Array_VarOut_T.h b/TAO/tao/Array_VarOut_T.h index 294c0c21a37..78ac9ed7eff 100644 --- a/TAO/tao/Array_VarOut_T.h +++ b/TAO/tao/Array_VarOut_T.h @@ -49,10 +49,10 @@ public: typedef T_slice _slice_type; typedef TAG _tag_type; - TAO_Array_Forany_T (void); + TAO_Array_Forany_T (); TAO_Array_Forany_T (_slice_type *, CORBA::Boolean nocopy = false); TAO_Array_Forany_T (const TAO_Array_Forany_T<T,T_slice,TAG> &); - ~TAO_Array_Forany_T (void); + ~TAO_Array_Forany_T (); static void _tao_any_destructor (void *); @@ -72,14 +72,14 @@ public: typedef _slice_type *& _retn_arg_type; // in, inout, out, _retn - _in_type in (void) const; - _inout_type inout (void); - _out_type out (void); - _retn_type _retn (void); - _slice_type * ptr (void) const; - CORBA::Boolean nocopy (void) const; - - static _slice_type * tao_alloc (void); + _in_type in () const; + _inout_type inout (); + _out_type out (); + _retn_type _retn (); + _slice_type * ptr () const; + CORBA::Boolean nocopy () const; + + static _slice_type * tao_alloc (); private: typedef TAO_Array_Forany_T<T,T_slice,TAG> FORANY; _slice_type * ptr_; @@ -99,10 +99,10 @@ public: typedef T_slice const & _const_subscript_type; typedef T_slice & _subscript_type; - TAO_Array_Var_Base_T (void); + TAO_Array_Var_Base_T (); TAO_Array_Var_Base_T (_slice_type *); TAO_Array_Var_Base_T (const TAO_Array_Var_Base_T<T,T_slice,TAG> &); - ~TAO_Array_Var_Base_T (void); + ~TAO_Array_Var_Base_T (); _subscript_type operator[] (CORBA::ULong index); _const_subscript_type operator[] (CORBA::ULong index) const; @@ -114,13 +114,13 @@ public: typedef _slice_type *& _retn_arg_type; // in, inout, out, _retn - _in_type in (void) const; - _inout_type inout (void); - _retn_type _retn (void); - _retn_arg_type _retn_arg (void); + _in_type in () const; + _inout_type inout (); + _retn_type _retn (); + _retn_arg_type _retn_arg (); // TAO extension. - _retn_type ptr (void) const; + _retn_type ptr () const; protected: typedef TAO_Array_Forany_T<T,T_slice,TAG> FORANY; _slice_type * ptr_; @@ -139,7 +139,7 @@ public: typedef T_slice _slice_type; typedef T_slice *_out_type; - TAO_FixedArray_Var_T (void); + TAO_FixedArray_Var_T (); TAO_FixedArray_Var_T (_slice_type *); TAO_FixedArray_Var_T (const TAO_FixedArray_Var_T<T,T_slice,TAG> &); @@ -147,7 +147,7 @@ public: TAO_FixedArray_Var_T<T,T_slice,TAG> &operator= ( const TAO_FixedArray_Var_T<T,T_slice,TAG> &); - _out_type out (void); + _out_type out (); private: // Some compilers don't look into the base class when parsing @@ -168,7 +168,7 @@ public: typedef T_slice _slice_type; typedef T_slice *&_out_type; - TAO_VarArray_Var_T (void); + TAO_VarArray_Var_T (); TAO_VarArray_Var_T (_slice_type *); TAO_VarArray_Var_T (const TAO_VarArray_Var_T<T,T_slice,TAG> &); @@ -176,7 +176,7 @@ public: TAO_VarArray_Var_T<T,T_slice,TAG> &operator= ( const TAO_VarArray_Var_T<T,T_slice,TAG> &); - _out_type out (void); + _out_type out (); operator _slice_type *& (); @@ -208,7 +208,7 @@ public: TAO_Array_Out_T<T,T_var,T_slice,TAG> &operator= (_slice_type *); operator _slice_type *& (); - _slice_type *& ptr (void); + _slice_type *& ptr (); _slice_type & operator[] (CORBA::ULong index); const _slice_type & operator[] (CORBA::ULong index) const; diff --git a/TAO/tao/Array_VarOut_T.inl b/TAO/tao/Array_VarOut_T.inl index a3ab61af4b8..b2be7077f10 100644 --- a/TAO/tao/Array_VarOut_T.inl +++ b/TAO/tao/Array_VarOut_T.inl @@ -189,8 +189,7 @@ TAO_Array_Out_T<T,T_var,T_slice,TAG>::TAO_Array_Out_T (T_var & p) template<typename T, typename T_var, typename T_slice, typename TAG> ACE_INLINE TAO_Array_Out_T<T,T_var,T_slice,TAG>::TAO_Array_Out_T ( - const TAO_Array_Out_T<T,T_var,T_slice,TAG> & p - ) + const TAO_Array_Out_T<T,T_var,T_slice,TAG> & p) : ptr_ (const_cast<THIS_OUT_TYPE &> (p).ptr_) {} @@ -198,8 +197,7 @@ template<typename T, typename T_var, typename T_slice, typename TAG> ACE_INLINE TAO_Array_Out_T<T,T_var,T_slice,TAG> & TAO_Array_Out_T<T,T_var,T_slice,TAG>::operator= ( - const TAO_Array_Out_T<T,T_var,T_slice,TAG> & p - ) + const TAO_Array_Out_T<T,T_var,T_slice,TAG> & p) { this->ptr_ = const_cast<THIS_OUT_TYPE &> (p).ptr_; return *this; @@ -250,8 +248,7 @@ template<typename T, typename T_slice, typename TAG> ACE_INLINE TAO_Array_Forany_T<T,T_slice,TAG>::TAO_Array_Forany_T ( T_slice * p, - CORBA::Boolean nocopy - ) + CORBA::Boolean nocopy) : ptr_ (p), nocopy_ (nocopy) {} @@ -259,8 +256,7 @@ TAO_Array_Forany_T<T,T_slice,TAG>::TAO_Array_Forany_T ( template<typename T, typename T_slice, typename TAG> ACE_INLINE TAO_Array_Forany_T<T,T_slice,TAG>::TAO_Array_Forany_T ( - const TAO_Array_Forany_T<T,T_slice,TAG> & p - ) + const TAO_Array_Forany_T<T,T_slice,TAG> & p) : ptr_ (p.ptr_), nocopy_ (p.nocopy_) { diff --git a/TAO/tao/Asynch_Queued_Message.cpp b/TAO/tao/Asynch_Queued_Message.cpp index f79242ceac2..e2952ff3569 100644 --- a/TAO/tao/Asynch_Queued_Message.cpp +++ b/TAO/tao/Asynch_Queued_Message.cpp @@ -24,7 +24,7 @@ TAO_Asynch_Queued_Message::TAO_Asynch_Queued_Message ( , offset_ (0) , abs_timeout_ (ACE_Time_Value::zero) { - if (timeout != 0)// && *timeout != ACE_Time_Value::zero) + if (timeout != nullptr)// && *timeout != ACE_Time_Value::zero) { this->abs_timeout_ = ACE_High_Res_Timer::gettimeofday_hr () + *timeout; } @@ -33,7 +33,7 @@ TAO_Asynch_Queued_Message::TAO_Asynch_Queued_Message ( size_t copy_offset = 0; for (const ACE_Message_Block *i = contents; - i != 0; + i != nullptr; i = i->cont ()) { ACE_OS::memcpy (this->buffer_ + copy_offset, @@ -57,20 +57,20 @@ TAO_Asynch_Queued_Message::TAO_Asynch_Queued_Message (char *buf, { } -TAO_Asynch_Queued_Message::~TAO_Asynch_Queued_Message (void) +TAO_Asynch_Queued_Message::~TAO_Asynch_Queued_Message () { // @@ Use a pool for these guys! delete [] this->buffer_; } size_t -TAO_Asynch_Queued_Message::message_length (void) const +TAO_Asynch_Queued_Message::message_length () const { return this->size_ - this->offset_; } int -TAO_Asynch_Queued_Message::all_data_sent (void) const +TAO_Asynch_Queued_Message::all_data_sent () const { return this->size_ == this->offset_; } @@ -112,7 +112,7 @@ TAO_Asynch_Queued_Message::bytes_transferred (size_t &byte_count) TAO_Queued_Message * TAO_Asynch_Queued_Message::clone (ACE_Allocator *alloc) { - char *buf = 0; + char *buf = nullptr; // @todo: Need to use a memory pool. But certain things need to // change a bit in this class for that. Till then. @@ -123,13 +123,13 @@ TAO_Asynch_Queued_Message::clone (ACE_Allocator *alloc) ACE_NEW_RETURN (buf, char[sz], - 0); + nullptr); ACE_OS::memcpy (buf, this->buffer_ + this->offset_, sz); - TAO_Asynch_Queued_Message *qm = 0; + TAO_Asynch_Queued_Message *qm = nullptr; if (alloc) { @@ -142,7 +142,7 @@ TAO_Asynch_Queued_Message::clone (ACE_Allocator *alloc) this->abs_timeout_, alloc, true), - 0); + nullptr); } else { @@ -160,16 +160,16 @@ TAO_Asynch_Queued_Message::clone (ACE_Allocator *alloc) this->orb_core_, sz, this->abs_timeout_, - 0, + nullptr, true), - 0); + nullptr); } return qm; } void -TAO_Asynch_Queued_Message::destroy (void) +TAO_Asynch_Queued_Message::destroy () { if (this->is_heap_created_) { diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp b/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp index a80ac9e9700..8fe4a8281e7 100644 --- a/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp +++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp @@ -28,8 +28,8 @@ TAO_Asynch_Reply_Dispatcher_Base::TAO_Asynch_Reply_Dispatcher_Base ( TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR, orb_core) - , transport_ (0) - , lock_ (0) + , transport_ (nullptr) + , lock_ (nullptr) , is_reply_dispatched_ (false) { // @@ NOTE: Need a separate option for this.. @@ -38,10 +38,10 @@ TAO_Asynch_Reply_Dispatcher_Base::TAO_Asynch_Reply_Dispatcher_Base ( } // Destructor. -TAO_Asynch_Reply_Dispatcher_Base::~TAO_Asynch_Reply_Dispatcher_Base (void) +TAO_Asynch_Reply_Dispatcher_Base::~TAO_Asynch_Reply_Dispatcher_Base () { // Release the transport that we own - if (this->transport_ != 0) + if (this->transport_ != nullptr) this->transport_->remove_reference (); if (this->lock_) @@ -51,7 +51,7 @@ TAO_Asynch_Reply_Dispatcher_Base::~TAO_Asynch_Reply_Dispatcher_Base (void) void TAO_Asynch_Reply_Dispatcher_Base::transport (TAO_Transport *t) { - if (this->transport_ != 0) + if (this->transport_ != nullptr) this->transport_->remove_reference (); this->transport_ = t; @@ -60,7 +60,7 @@ TAO_Asynch_Reply_Dispatcher_Base::transport (TAO_Transport *t) } bool -TAO_Asynch_Reply_Dispatcher_Base::try_dispatch_reply (void) +TAO_Asynch_Reply_Dispatcher_Base::try_dispatch_reply () { if (this->is_reply_dispatched_) { diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.h b/TAO/tao/Asynch_Reply_Dispatcher_Base.h index ca07c546f93..ada4e29eacb 100644 --- a/TAO/tao/Asynch_Reply_Dispatcher_Base.h +++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.h @@ -70,11 +70,11 @@ public: * Why are we clumping everything in one method. Answer is we need * atomicity? */ - bool try_dispatch_reply (void); + bool try_dispatch_reply (); protected: /// Destructor. - virtual ~TAO_Asynch_Reply_Dispatcher_Base (void); + virtual ~TAO_Asynch_Reply_Dispatcher_Base (); private: void operator= (const TAO_Asynch_Reply_Dispatcher_Base &); diff --git a/TAO/tao/Base_Transport_Property.cpp b/TAO/tao/Base_Transport_Property.cpp index 4a4f834c157..17a83e1a618 100644 --- a/TAO/tao/Base_Transport_Property.cpp +++ b/TAO/tao/Base_Transport_Property.cpp @@ -7,21 +7,21 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Base_Transport_Property::~TAO_Base_Transport_Property (void) +TAO_Base_Transport_Property::~TAO_Base_Transport_Property () { } TAO_Transport_Descriptor_Interface * -TAO_Base_Transport_Property::duplicate (void) +TAO_Base_Transport_Property::duplicate () { // Get a copy of the underlying endpoint TAO_Endpoint *const endpt = this->endpoint_->duplicate (); - if (endpt == 0) - return 0; + if (endpt == nullptr) + return nullptr; // Construct a copy of our class - TAO_Base_Transport_Property *prop = 0; - ACE_NEW_RETURN (prop, TAO_Base_Transport_Property (endpt, true), 0); + TAO_Base_Transport_Property *prop = nullptr; + ACE_NEW_RETURN (prop, TAO_Base_Transport_Property (endpt, true), nullptr); return prop; } @@ -33,7 +33,7 @@ TAO_Base_Transport_Property::is_equivalent const TAO_Base_Transport_Property *other_desc = dynamic_cast<const TAO_Base_Transport_Property *> (rhs); - if (other_desc == 0) + if (other_desc == nullptr) return false; return this->endpoint_->is_equivalent (other_desc->endpoint_); @@ -41,7 +41,7 @@ TAO_Base_Transport_Property::is_equivalent u_long -TAO_Base_Transport_Property::hash (void) const +TAO_Base_Transport_Property::hash () const { return this->endpoint_->hash (); } diff --git a/TAO/tao/Basic_Argument_T.h b/TAO/tao/Basic_Argument_T.h index 8af4f039df8..806620dc950 100644 --- a/TAO/tao/Basic_Argument_T.h +++ b/TAO/tao/Basic_Argument_T.h @@ -39,7 +39,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S arg (void) const; + S arg () const; protected: S const & x_; @@ -58,9 +58,9 @@ namespace TAO { public: In_Basic_Clonable_Argument_T (S const & x); - virtual ~In_Basic_Clonable_Argument_T (void); + virtual ~In_Basic_Clonable_Argument_T (); - virtual Argument* clone (void); + virtual Argument* clone (); private: bool is_clone_; @@ -84,7 +84,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S & arg (void); + S & arg (); private: S & x_; @@ -107,7 +107,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S & arg (void); + S & arg (); private: S & x_; @@ -124,16 +124,16 @@ namespace TAO class Ret_Basic_Argument_T : public RetArgument { public: - Ret_Basic_Argument_T (void); + Ret_Basic_Argument_T (); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S & arg (void); + S & arg (); - S excp (void); - S retn (void); + S excp (); + S retn (); private: S x_; diff --git a/TAO/tao/BiDir_Adapter.cpp b/TAO/tao/BiDir_Adapter.cpp index c5e01c278f8..1149f04dc66 100644 --- a/TAO/tao/BiDir_Adapter.cpp +++ b/TAO/tao/BiDir_Adapter.cpp @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_BiDir_Adapter::~TAO_BiDir_Adapter (void) +TAO_BiDir_Adapter::~TAO_BiDir_Adapter () { } diff --git a/TAO/tao/Bind_Dispatcher_Guard.cpp b/TAO/tao/Bind_Dispatcher_Guard.cpp index 7922d29f21c..09a144d62f3 100644 --- a/TAO/tao/Bind_Dispatcher_Guard.cpp +++ b/TAO/tao/Bind_Dispatcher_Guard.cpp @@ -21,7 +21,7 @@ TAO_Bind_Dispatcher_Guard::TAO_Bind_Dispatcher_Guard (CORBA::ULong request_id, this->status_ = TAO_Bind_Dispatcher_Guard::NO_UNBIND; } -TAO_Bind_Dispatcher_Guard::~TAO_Bind_Dispatcher_Guard (void) +TAO_Bind_Dispatcher_Guard::~TAO_Bind_Dispatcher_Guard () { // We try unbinding. If it works it works, else cant do much about // it.. diff --git a/TAO/tao/Bind_Dispatcher_Guard.h b/TAO/tao/Bind_Dispatcher_Guard.h index 13ffed795ee..d1e26eedb8b 100644 --- a/TAO/tao/Bind_Dispatcher_Guard.h +++ b/TAO/tao/Bind_Dispatcher_Guard.h @@ -29,10 +29,10 @@ public: TAO_Reply_Dispatcher* rd, TAO_Transport_Mux_Strategy* tms); - ~TAO_Bind_Dispatcher_Guard (void); + ~TAO_Bind_Dispatcher_Guard (); /// Returns 0 if successful and non-zero otherwise. - int unbind_dispatcher (void); + int unbind_dispatcher (); /// State information enum TAO_Bind_Dispatcher_Status @@ -44,7 +44,7 @@ public: }; /// Get status - TAO_Bind_Dispatcher_Status status (void) const; + TAO_Bind_Dispatcher_Status status () const; /// Set status void status (TAO_Bind_Dispatcher_Status status); diff --git a/TAO/tao/Bind_Dispatcher_Guard.inl b/TAO/tao/Bind_Dispatcher_Guard.inl index 3068dfd7608..f38bc197f40 100644 --- a/TAO/tao/Bind_Dispatcher_Guard.inl +++ b/TAO/tao/Bind_Dispatcher_Guard.inl @@ -22,13 +22,13 @@ TAO_Bind_Dispatcher_Guard::status (TAO_Bind_Dispatcher_Status s) } ACE_INLINE TAO_Bind_Dispatcher_Guard::TAO_Bind_Dispatcher_Status -TAO_Bind_Dispatcher_Guard::status (void) const +TAO_Bind_Dispatcher_Guard::status () const { return this->status_; } ACE_INLINE int -TAO_Bind_Dispatcher_Guard::unbind_dispatcher (void) +TAO_Bind_Dispatcher_Guard::unbind_dispatcher () { int const retval = this->tms_->unbind_dispatcher (this->request_id_); diff --git a/TAO/tao/Blocked_Connect_Strategy.cpp b/TAO/tao/Blocked_Connect_Strategy.cpp index b55e0ff00c2..0c731feb8e4 100644 --- a/TAO/tao/Blocked_Connect_Strategy.cpp +++ b/TAO/tao/Blocked_Connect_Strategy.cpp @@ -15,7 +15,7 @@ void TAO_Blocked_Connect_Strategy::synch_options (ACE_Time_Value *timeout, ACE_Synch_Options &options) { - if (timeout != 0) + if (timeout != nullptr) { // Blocking with a timeout options.set (ACE_Synch_Options::USE_TIMEOUT, *timeout); diff --git a/TAO/tao/Bounded_Basic_String_Sequence_T.h b/TAO/tao/Bounded_Basic_String_Sequence_T.h index 553d70f6349..a249e9110ff 100644 --- a/TAO/tao/Bounded_Basic_String_Sequence_T.h +++ b/TAO/tao/Bounded_Basic_String_Sequence_T.h @@ -12,7 +12,6 @@ #include "tao/Generic_Sequence_T.h" #include "tao/String_Sequence_Element_T.h" #include "tao/String_Const_Sequence_Element_T.h" -#include "tao/MM_Sequence_Iterator_T.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -38,7 +37,7 @@ public: typedef details::generic_sequence<value_type, allocation_traits, element_traits> implementation_type; // @copydoc TAO::details::generic_sequence::generic_sequence() - inline bounded_basic_string_sequence(void) + inline bounded_basic_string_sequence() : impl_() {} // @copydoc TAO::details::generic_sequence::generic_sequence() @@ -105,77 +104,6 @@ public: implementation_type::freebuf(buffer); } -#if defined TAO_HAS_SEQUENCE_ITERATORS && TAO_HAS_SEQUENCE_ITERATORS == 1 - - /// - /// Additions to support iterator semantics for TAO unbounded basic - /// string sequences. - /// - - // = Traits and factory methods that create iterators. - typedef MM_Sequence_Iterator<bounded_basic_string_sequence<charT, MAX> > iterator; - typedef Const_MM_Sequence_Iterator<bounded_basic_string_sequence<charT, MAX> > const_iterator; - typedef MM_Sequence_Reverse_Iterator<bounded_basic_string_sequence<charT, MAX> > reverse_iterator; - typedef Const_MM_Sequence_Reverse_Iterator<bounded_basic_string_sequence<charT, MAX> > const_reverse_iterator; - - /// Get an iterator that points to the beginning of the sequence. - inline iterator begin (void) - { - return iterator (&this->impl_); - } - - /// Get a const iterator that points to the beginning of the sequence. - inline const_iterator begin (void) const - { - return const_iterator (&this->impl_); - } - - /// Get an iterator that points to the end of the sequence. - inline iterator end (void) - { - return iterator (&this->impl_, - this->impl_.length ()); - } - - /// Get a const iterator that points to the end of the sequence. - inline const_iterator end (void) const - { - return const_iterator (&this->impl_, - this->impl_.length ()); - } - - /// Get a reverse iterator that points to the end of the sequence. - inline reverse_iterator rbegin (void) - { - return reverse_iterator (&this->impl_, - this->impl_.length () - 1); - } - - /// Get a const reverse iterator that points to the end of the sequence. - inline const_reverse_iterator rbegin (void) const - { - return const_reverse_iterator (&this->impl_, - this->impl_.length () - 1); - } - - /// Get a reverse iterator that points to one before the beginning - /// of the sequence. - inline reverse_iterator rend (void) - { - return reverse_iterator (&this->impl_, - -1); - } - - /// Get a const reverse iterator that points to one before the - /// beginning of the sequence. - inline const_reverse_iterator rend (void) const - { - return const_reverse_iterator (&this->impl_, - -1); - } - -#endif /* TAO_HAS_SEQUENCE_ITERATORS==1 */ - private: implementation_type impl_; }; diff --git a/TAO/tao/Bounded_Object_Reference_Sequence_T.h b/TAO/tao/Bounded_Object_Reference_Sequence_T.h index 7a8cda5385a..1f3c7d0d577 100644 --- a/TAO/tao/Bounded_Object_Reference_Sequence_T.h +++ b/TAO/tao/Bounded_Object_Reference_Sequence_T.h @@ -12,7 +12,6 @@ #include "Generic_Sequence_T.h" #include "Object_Reference_Sequence_Element_T.h" #include "Object_Reference_Const_Sequence_Element_T.h" -#include "tao/MM_Sequence_Iterator_T.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -109,78 +108,6 @@ public: implementation_type::freebuf(buffer); } - -#if defined TAO_HAS_SEQUENCE_ITERATORS && TAO_HAS_SEQUENCE_ITERATORS == 1 - - /// - /// Additions to support iterator semantics for TAO bounded object - /// reference sequences. - /// - - // = Traits and factory methods that create iterators. - typedef MM_Sequence_Iterator<bounded_object_reference_sequence<object_t, object_t_var, MAX> > iterator; - typedef Const_MM_Sequence_Iterator<bounded_object_reference_sequence<object_t, object_t_var, MAX> > const_iterator; - typedef MM_Sequence_Reverse_Iterator<bounded_object_reference_sequence<object_t, object_t_var, MAX> > reverse_iterator; - typedef Const_MM_Sequence_Reverse_Iterator<bounded_object_reference_sequence<object_t, object_t_var, MAX> > const_reverse_iterator; - - /// Get an iterator that points to the beginning of the sequence. - iterator begin (void) - { - return iterator (&this->impl_); - } - - /// Get a const iterator that points to the beginning of the sequence. - const_iterator begin (void) const - { - return const_iterator (&this->impl_); - } - - /// Get an iterator that points to the end of the sequence. - iterator end (void) - { - return iterator (&this->impl_, - this->impl_.length ()); - } - - /// Get a const iterator that points to the end of the sequence. - const_iterator end (void) const - { - return const_iterator (&this->impl_, - this->impl_.length ()); - } - - /// Get a reverse iterator that points to the end of the sequence. - reverse_iterator rbegin (void) - { - return reverse_iterator (&this->impl_, - this->impl_.length () - 1); - } - - /// Get a const reverse iterator that points to the end of the sequence. - const_reverse_iterator rbegin (void) const - { - return const_reverse_iterator (&this->impl_, - this->impl_.length () - 1); - } - - /// Get a reverse iterator that points to one before the beginning - /// of the sequence. - reverse_iterator rend (void) - { - return reverse_iterator (&this->impl_, - -1); - } - - /// Get a const reverse iterator that points to one before the - /// beginning of the sequence. - const_reverse_iterator rend (void) const - { - return const_reverse_iterator (&this->impl_, - -1); - } - -#endif /* TAO_HAS_SEQUENCE_ITERATORS==1 */ - private: implementation_type impl_; }; diff --git a/TAO/tao/Buffer_Allocator_T.h b/TAO/tao/Buffer_Allocator_T.h index bed4622609c..723de777a9e 100644 --- a/TAO/tao/Buffer_Allocator_T.h +++ b/TAO/tao/Buffer_Allocator_T.h @@ -39,7 +39,7 @@ namespace TAO typedef alloc_type ALLOC_TYPE; TAO_Buffer_Allocator (alloc_type *allocator); - virtual handler_type *allocate (void); + virtual handler_type *allocate (); virtual void release (handler_type *ptr); private: alloc_type* allocator_; diff --git a/TAO/tao/CDR.cpp b/TAO/tao/CDR.cpp index 53c4318b9c1..79835eacf2c 100644 --- a/TAO/tao/CDR.cpp +++ b/TAO/tao/CDR.cpp @@ -64,12 +64,12 @@ TAO_OutputCDR::TAO_OutputCDR (size_t size, memcpy_tradeoff, major_version, minor_version) - , fragmentation_strategy_ (0) + , fragmentation_strategy_ (nullptr) , more_fragments_ (false) , request_id_ (0) - , stub_ (0) + , stub_ (nullptr) , message_semantics_ (TAO_Message_Semantics::TAO_TWOWAY_REQUEST) - , timeout_ (0) + , timeout_ (nullptr) { ACE_FUNCTION_TIMEPROBE (TAO_OUTPUT_CDR_CTOR1_ENTER); @@ -100,12 +100,12 @@ TAO_OutputCDR::TAO_OutputCDR (char *data, memcpy_tradeoff, major_version, minor_version) - , fragmentation_strategy_ (0) + , fragmentation_strategy_ (nullptr) , more_fragments_ (false) , request_id_ (0) - , stub_ (0) + , stub_ (nullptr) , message_semantics_ (TAO_Message_Semantics::TAO_TWOWAY_REQUEST) - , timeout_ (0) + , timeout_ (nullptr) { ACE_FUNCTION_TIMEPROBE (TAO_OUTPUT_CDR_CTOR2_ENTER); } @@ -132,9 +132,9 @@ TAO_OutputCDR::TAO_OutputCDR (char *data, , fragmentation_strategy_ (fs) , more_fragments_ (false) , request_id_ (0) - , stub_ (0) + , stub_ (nullptr) , message_semantics_ (TAO_Message_Semantics::TAO_TWOWAY_REQUEST) - , timeout_ (0) + , timeout_ (nullptr) { ACE_FUNCTION_TIMEPROBE (TAO_OUTPUT_CDR_CTOR3_ENTER); } @@ -149,12 +149,12 @@ TAO_OutputCDR::TAO_OutputCDR (ACE_Message_Block *data, memcpy_tradeoff, major_version, minor_version) - , fragmentation_strategy_ (0) + , fragmentation_strategy_ (nullptr) , more_fragments_ (false) , request_id_ (0) - , stub_ (0) + , stub_ (nullptr) , message_semantics_ (TAO_Message_Semantics::TAO_TWOWAY_REQUEST) - , timeout_ (0) + , timeout_ (nullptr) { ACE_FUNCTION_TIMEPROBE (TAO_OUTPUT_CDR_CTOR4_ENTER); } @@ -175,9 +175,9 @@ TAO_OutputCDR::TAO_OutputCDR (ACE_Data_Block *data_block, , fragmentation_strategy_ (fs) , more_fragments_ (false) , request_id_ (0) - , stub_ (0) + , stub_ (nullptr) , message_semantics_ (TAO_Message_Semantics::TAO_TWOWAY_REQUEST) - , timeout_ (0) + , timeout_ (nullptr) { ACE_FUNCTION_TIMEPROBE (TAO_OUTPUT_CDR_CTOR5_ENTER); } @@ -291,15 +291,15 @@ TAO_InputCDR::TAO_InputCDR (const TAO_OutputCDR& rhs, : ACE_InputCDR (rhs, buffer_allocator ? buffer_allocator - : (orb_core ? orb_core->output_cdr_buffer_allocator () : 0), + : (orb_core ? orb_core->output_cdr_buffer_allocator () : nullptr), data_block_allocator ? data_block_allocator : (orb_core ? orb_core->output_cdr_dblock_allocator () : - 0), + nullptr), message_block_allocator ? message_block_allocator : (orb_core ? - orb_core->output_cdr_msgblock_allocator () : 0)), + orb_core->output_cdr_msgblock_allocator () : nullptr)), orb_core_ (orb_core) { } diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h index f7406c6000d..1b1168c5cf2 100644 --- a/TAO/tao/CDR.h +++ b/TAO/tao/CDR.h @@ -163,7 +163,7 @@ public: ACE_CDR::Octet minor_version = TAO_DEF_GIOP_MINOR); /// Destructor. - ~TAO_OutputCDR (void); + ~TAO_OutputCDR (); // @todo do we want a special method to write an array of // strings and wstrings? @@ -190,7 +190,7 @@ public: ACE_CDR::ULong pending_length); /// Are there more data fragments to come? - bool more_fragments (void) const; + bool more_fragments () const; /// Specify whether there are more data fragments to come. void more_fragments (bool more); @@ -202,16 +202,16 @@ public: ACE_Time_Value * timeout); /// Fragmented message request ID. - CORBA::ULong request_id (void) const; + CORBA::ULong request_id () const; /// Stub object associated with the request. - TAO_Stub * stub (void) const; + TAO_Stub * stub () const; /// Message semantics (twoway, oneway, reply) - TAO_Message_Semantics message_semantics (void) const; + TAO_Message_Semantics message_semantics () const; /// Maximum time to wait for outgoing message to be sent. - ACE_Time_Value * timeout (void) const; + ACE_Time_Value * timeout () const; //@} /// These methods are used by valuetype indirection support. @@ -240,9 +240,10 @@ public: int offset (char* pos); private: - // disallow copying... - TAO_OutputCDR (const TAO_OutputCDR& rhs); - TAO_OutputCDR& operator= (const TAO_OutputCDR& rhs); + TAO_OutputCDR (const TAO_OutputCDR&rhs) = delete; + TAO_OutputCDR& operator= (const TAO_OutputCDR&) = delete; + TAO_OutputCDR (TAO_OutputCDR&&) = delete; + TAO_OutputCDR& operator= (TAO_OutputCDR&&) = delete; private: /** @@ -408,17 +409,15 @@ public: TAO_InputCDR (ACE_InputCDR::Transfer_Contents rhs, TAO_ORB_Core* orb_core = 0); -#if defined (ACE_HAS_CPP11) TAO_InputCDR& operator= (const TAO_InputCDR&) = default; -#endif /* ACE_HAS_CPP11 */ /// Destructor - virtual ~TAO_InputCDR (void); + virtual ~TAO_InputCDR (); // = TAO specific methods. /// Accessor - TAO_ORB_Core *orb_core (void) const; + TAO_ORB_Core *orb_core () const; ACE_Message_Block::Message_Flags clr_mb_flags( ACE_Message_Block::Message_Flags less_flags ); diff --git a/TAO/tao/CDR.inl b/TAO/tao/CDR.inl index c4fb156fcc5..08d0efeae3e 100644 --- a/TAO/tao/CDR.inl +++ b/TAO/tao/CDR.inl @@ -454,14 +454,10 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os, ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os, const std::string &x) { -#if defined (ACE_HAS_CPP11) return os.fragment_stream (ACE_CDR::OCTET_ALIGN, sizeof (char)) && static_cast<ACE_OutputCDR &> (os) << x; -#else - return os << x.c_str (); -#endif } ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os, @@ -479,16 +475,12 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os, ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os, const std::wstring &x) { -#if defined (ACE_HAS_CPP11) return os.fragment_stream ((sizeof (CORBA::WChar) == 2 ? ACE_CDR::SHORT_ALIGN : ACE_CDR::LONG_ALIGN), sizeof (CORBA::WChar)) && static_cast<ACE_OutputCDR &> (os) << x; -#else - return os << x.c_str (); -#endif } ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os, diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp index fd98b445944..dff01bf48c0 100644 --- a/TAO/tao/CORBALOC_Parser.cpp +++ b/TAO/tao/CORBALOC_Parser.cpp @@ -31,7 +31,7 @@ static const char iiop_token_len = sizeof iiop_token - 1; TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_CORBALOC_Parser::~TAO_CORBALOC_Parser (void) +TAO_CORBALOC_Parser::~TAO_CORBALOC_Parser () { } @@ -49,7 +49,7 @@ TAO_CORBALOC_Parser::make_stub_from_mprofile (CORBA::ORB_ptr orb, TAO_MProfile &mprofile) { // Create a TAO_Stub. - TAO_Stub *data = orb->orb_core ()->create_stub ((const char *) 0, mprofile); + TAO_Stub *data = orb->orb_core ()->create_stub ((const char *) nullptr, mprofile); TAO_Stub_Auto_Ptr safe_data (data); @@ -137,10 +137,10 @@ TAO_CORBALOC_Parser::parse_string (const char * ior, CORBA::ORB_ptr orb) size_t ndx = endpoints.size(); endpoints.size(ndx+1); bool uiop_compatible = false; - TAO_ConnectorSetIterator conn_iter = 0; + TAO_ConnectorSetIterator conn_iter = nullptr; for (conn_iter = conn_reg->begin(); conn_iter != conn_reg->end() && - endpoints[ndx].profile_ == 0; + endpoints[ndx].profile_ == nullptr; conn_iter ++) { endpoints[ndx].profile_ = @@ -156,7 +156,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior, CORBA::ORB_ptr orb) } } - if (endpoints[ndx].profile_ == 0) + if (endpoints[ndx].profile_ == nullptr) { if (TAO_debug_level) TAOLIB_ERROR ((LM_ERROR, @@ -212,7 +212,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior, CORBA::ORB_ptr orb) endpoints[i].profile_->parse_string (str); int const share = orb->orb_core()->orb_params()->shared_profile(); if (mprofile.give_profile(endpoints[i].profile_, share) != -1) - endpoints[i].profile_ = 0; + endpoints[i].profile_ = nullptr; else { // Although this ought never happen, we want to make some @@ -252,7 +252,7 @@ TAO_CORBALOC_Parser::make_canonical (const char *ior, const char *addr_tail = ior + prot_addr_len; // skip past version, if any separator = ACE_OS::strchr (addr_base,'@'); - if (separator != 0 && separator < addr_tail) + if (separator != nullptr && separator < addr_tail) { canonical_endpoint.set (addr_base,(separator - addr_base)+1,1); addr_base = separator + 1; @@ -293,7 +293,7 @@ TAO_CORBALOC_Parser::make_canonical (const char *ior, } #endif /* ACE_HAS_IPV6 */ - if (separator != 0 && separator < addr_tail) + if (separator != nullptr && separator < addr_tail) { // we have a port number raw_host.set (addr_base, (separator - addr_base), 1); diff --git a/TAO/tao/CORBANAME_Parser.cpp b/TAO/tao/CORBANAME_Parser.cpp index 0cdd89afda9..2bd5edee9be 100644 --- a/TAO/tao/CORBANAME_Parser.cpp +++ b/TAO/tao/CORBANAME_Parser.cpp @@ -18,7 +18,7 @@ static const char corbaname_prefix[] = "corbaname:"; TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_CORBANAME_Parser::~TAO_CORBANAME_Parser (void) +TAO_CORBANAME_Parser::~TAO_CORBANAME_Parser () { } @@ -51,7 +51,7 @@ parse_string_dynamic_request_helper (CORBA::Object_ptr naming_context, 11, TAO::TAO_CO_NONE | TAO::TAO_CO_THRU_POA_STRATEGY); - tao_call.invoke (0, 0); + tao_call.invoke (nullptr, 0); return _tao_retval.retn (); } @@ -73,7 +73,7 @@ TAO_CORBANAME_Parser::parse_string (const char *ior, CORBA::ORB_ptr orb) // string ACE_CString::size_type pos_seperator = 0; - ACE_CString corbaname_str (corbaname, 0, 1); + ACE_CString corbaname_str (corbaname, nullptr, 1); pos_seperator = corbaname_str.find ("#", 0); @@ -90,13 +90,12 @@ TAO_CORBANAME_Parser::parse_string (const char *ior, CORBA::ORB_ptr orb) // CORBALOC assumes "NameService" for the object key if none // is provided, so just pass everything between "corbaname:" // and "#" as the address - ACE_CString corbaloc_addr ("corbaloc:", 0, 1); + ACE_CString corbaloc_addr ("corbaloc:", nullptr, 1); corbaloc_addr += corbaname_str.substring (0, pos_seperator); // Obtain a reference to the naming context CORBA::Object_var name_context = - orb->string_to_object (corbaloc_addr.c_str () - ); + orb->string_to_object (corbaloc_addr.c_str ()); // Check if the Object reference is nil. if (CORBA::is_nil (name_context.in ())) diff --git a/TAO/tao/CORBA_String.h b/TAO/tao/CORBA_String.h index 81dd555f150..5e308bc9ad2 100644 --- a/TAO/tao/CORBA_String.h +++ b/TAO/tao/CORBA_String.h @@ -52,7 +52,7 @@ namespace TAO typedef TAO::details::string_traits_base <character_type> s_traits; /// Default constructor. - inline String_var (void) : ptr_ (0) + inline String_var () : ptr_ (0) { } @@ -72,7 +72,7 @@ namespace TAO } /// Destructor. - inline ~String_var (void) + inline ~String_var () { s_traits::release (this->ptr_); } @@ -128,19 +128,19 @@ namespace TAO } /// For in parameter. - inline const character_type *in (void) const + inline const character_type *in () const { return this->ptr_; } /// For inout parameter. - inline character_type *&inout (void) + inline character_type *&inout () { return this->ptr_; } /// For out parameter. - inline character_type *&out (void) + inline character_type *&out () { s_traits::release (this->ptr_); this->ptr_ = 0; @@ -148,7 +148,7 @@ namespace TAO } /// For string of return type. - inline character_type *_retn (void) + inline character_type *_retn () { character_type *temp = this->ptr_; this->ptr_ = 0; @@ -225,7 +225,7 @@ namespace TAO } /// Return underlying instance. - inline character_type *&ptr (void) + inline character_type *&ptr () { return this->ptr_; } diff --git a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp index 28bbada650c..84741bf7299 100644 --- a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp +++ b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp @@ -30,8 +30,7 @@ TAO_CSD_Default_Servant_Dispatcher::create_Root_POA (const ACE_CString &name, lock, thread_lock, orb_core, - object_adapter - ), + object_adapter), CORBA::NO_MEMORY ()); diff --git a/TAO/tao/CSD_Framework/CSD_POA.cpp b/TAO/tao/CSD_Framework/CSD_POA.cpp index a77bb5f32e9..9729e0950ac 100644 --- a/TAO/tao/CSD_Framework/CSD_POA.cpp +++ b/TAO/tao/CSD_Framework/CSD_POA.cpp @@ -70,8 +70,7 @@ TAO_CSD_POA::new_POA (const String &name, lock, thread_lock, orb_core, - object_adapter - ), + object_adapter), CORBA::NO_MEMORY ()); TAO_CSD_Strategy_Repository *repo = diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h index 73597bdd60f..d4664257a1c 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h @@ -41,7 +41,6 @@ namespace TAO class TAO_CSD_TP_Export TP_Synch_Helper { public: - /// Constructor. Sets initial state to PENDING. TP_Synch_Helper(); @@ -63,7 +62,6 @@ namespace TAO /// wait_while_pending() to unblock. void cancelled(); - private: /// Enumeration Type for all possible states of this helper object. enum HelperState @@ -89,7 +87,6 @@ namespace TAO /// state is something other than the PENDING state. ConditionType condition_; }; - } } diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl index adf5c1b1bc3..05930380a53 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl @@ -10,13 +10,11 @@ TAO::CSD::TP_Synch_Helper::TP_Synch_Helper() { } - ACE_INLINE TAO::CSD::TP_Synch_Helper::~TP_Synch_Helper() { } - ACE_INLINE bool TAO::CSD::TP_Synch_Helper::wait_while_pending() @@ -31,7 +29,6 @@ TAO::CSD::TP_Synch_Helper::wait_while_pending() return (this->state_ == DISPATCHED); } - ACE_INLINE void TAO::CSD::TP_Synch_Helper::dispatched() @@ -41,7 +38,6 @@ TAO::CSD::TP_Synch_Helper::dispatched() this->condition_.signal(); } - ACE_INLINE void TAO::CSD::TP_Synch_Helper::cancelled() diff --git a/TAO/tao/Cache_Entries_T.cpp b/TAO/tao/Cache_Entries_T.cpp index e047a890c89..2b3bd726512 100644 --- a/TAO/tao/Cache_Entries_T.cpp +++ b/TAO/tao/Cache_Entries_T.cpp @@ -25,7 +25,7 @@ namespace TAO } template <typename TRANSPORT_TYPE> - Cache_IntId_T<TRANSPORT_TYPE>::~Cache_IntId_T (void) + Cache_IntId_T<TRANSPORT_TYPE>::~Cache_IntId_T () { if (this->transport_) this->transport_->remove_reference (); diff --git a/TAO/tao/Cache_Entries_T.h b/TAO/tao/Cache_Entries_T.h index a4762e34cc8..ed391738a38 100644 --- a/TAO/tao/Cache_Entries_T.h +++ b/TAO/tao/Cache_Entries_T.h @@ -65,7 +65,7 @@ namespace TAO typedef TRANSPORT_TYPE transport_type; /// Constructor. - Cache_IntId_T (void); + Cache_IntId_T (); /// Constructor. Cache_IntId_T (transport_type *transport); @@ -74,7 +74,7 @@ namespace TAO Cache_IntId_T (const Cache_IntId_T & rhs); /// Destructor. - ~Cache_IntId_T (void); + ~Cache_IntId_T (); /// Assignment operator (does copy memory). Cache_IntId_T& operator= (const Cache_IntId_T &rhs); @@ -86,16 +86,16 @@ namespace TAO bool operator!= (const Cache_IntId_T &rhs) const; /// Return the underlying transport - transport_type *transport (void); + transport_type *transport (); /// Return the underlying transport - const transport_type *transport (void) const; + const transport_type *transport () const; /// Set recycle_state. void recycle_state (Cache_Entries_State new_state); /// Get recycle_state. - Cache_Entries_State recycle_state (void) const; + Cache_Entries_State recycle_state () const; /// Relinquish ownership of the TAO_Transport object associated with /// this Cache_IntId_T. @@ -106,10 +106,10 @@ namespace TAO * This method really only exists to get around inadequacies * in the Transport_Cache_Map_Manager interface. */ - transport_type *relinquish_transport (void); + transport_type *relinquish_transport (); /// Get the connected flag - bool is_connected (void) const; + bool is_connected () const; /// Set the connected flag void is_connected (bool connected); @@ -144,7 +144,7 @@ namespace TAO typedef TRANSPORT_DESCRIPTOR_TYPE transport_descriptor_type; /// Constructor. - Cache_ExtId_T (void); + Cache_ExtId_T (); /// Constructor. explicit Cache_ExtId_T (transport_descriptor_type *prop); @@ -153,7 +153,7 @@ namespace TAO Cache_ExtId_T (const Cache_ExtId_T & rhs); /// Destructor. - ~Cache_ExtId_T (void); + ~Cache_ExtId_T (); // = Assignment and comparison operators. /// Assignment operator (does copy memory). @@ -167,24 +167,24 @@ namespace TAO /// hash function is required in order for this class to be usable by /// ACE_Hash_Map_Manager_Ex. - u_long hash (void) const; + u_long hash () const; /// Make a deep copy of the underlying pointer - void duplicate (void); + void duplicate (); /// Return the index value - CORBA::ULong index (void) const; + CORBA::ULong index () const; /// Set the index value. This calls should not be used by any users /// but for the TAO_Transport_Cache_Manager class. void index (CORBA::ULong index); /// Increment the index value - void incr_index (void); + void incr_index (); // = Accessors /// Get the underlying the property pointer - transport_descriptor_type *property (void) const; + transport_descriptor_type *property () const; private: /// A property object that we represent. diff --git a/TAO/tao/Cache_Entries_T.inl b/TAO/tao/Cache_Entries_T.inl index 1b4121eef81..411c7d0e0ff 100644 --- a/TAO/tao/Cache_Entries_T.inl +++ b/TAO/tao/Cache_Entries_T.inl @@ -7,7 +7,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { template <typename TRANSPORT_TYPE> ACE_INLINE - Cache_IntId_T<TRANSPORT_TYPE>::Cache_IntId_T (void) + Cache_IntId_T<TRANSPORT_TYPE>::Cache_IntId_T () : transport_ (0), recycle_state_ (ENTRY_UNKNOWN), is_connected_ (false) @@ -37,21 +37,21 @@ namespace TAO template <typename TRANSPORT_TYPE> ACE_INLINE typename Cache_IntId_T<TRANSPORT_TYPE>::transport_type * - Cache_IntId_T<TRANSPORT_TYPE>::transport (void) + Cache_IntId_T<TRANSPORT_TYPE>::transport () { return this->transport_; } template <typename TRANSPORT_TYPE> ACE_INLINE const typename Cache_IntId_T<TRANSPORT_TYPE>::transport_type * - Cache_IntId_T<TRANSPORT_TYPE>::transport (void) const + Cache_IntId_T<TRANSPORT_TYPE>::transport () const { return this->transport_; } template <typename TRANSPORT_TYPE> ACE_INLINE bool - Cache_IntId_T<TRANSPORT_TYPE>::is_connected (void) const + Cache_IntId_T<TRANSPORT_TYPE>::is_connected () const { return this->is_connected_; } @@ -64,14 +64,14 @@ namespace TAO } template <typename TRANSPORT_TYPE> ACE_INLINE Cache_Entries_State - Cache_IntId_T<TRANSPORT_TYPE>::recycle_state (void) const + Cache_IntId_T<TRANSPORT_TYPE>::recycle_state () const { return this->recycle_state_; } template <typename TRANSPORT_TYPE> ACE_INLINE typename Cache_IntId_T<TRANSPORT_TYPE>::transport_type * - Cache_IntId_T<TRANSPORT_TYPE>::relinquish_transport (void) + Cache_IntId_T<TRANSPORT_TYPE>::relinquish_transport () { // Yield ownership of the TAO_Transport object. transport_type *val = this->transport_; @@ -98,7 +98,7 @@ namespace TAO /*******************************************************/ template <typename TRANSPORT_DESCRIPTOR_TYPE> ACE_INLINE - Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::Cache_ExtId_T (void) + Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::Cache_ExtId_T () : transport_property_ (0), is_delete_ (false), index_ (0) @@ -116,7 +116,7 @@ namespace TAO } template <typename TRANSPORT_DESCRIPTOR_TYPE> ACE_INLINE - Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::~Cache_ExtId_T (void) + Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::~Cache_ExtId_T () { if (this->is_delete_) delete this->transport_property_; @@ -173,13 +173,13 @@ namespace TAO } template <typename TRANSPORT_DESCRIPTOR_TYPE> ACE_INLINE u_long - Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::hash (void) const + Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::hash () const { return (this->transport_property_->hash () + this->index_); } template <typename TRANSPORT_DESCRIPTOR_TYPE> ACE_INLINE void - Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::duplicate (void) + Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::duplicate () { transport_descriptor_type *prop = 0; @@ -199,7 +199,7 @@ namespace TAO template <typename TRANSPORT_DESCRIPTOR_TYPE> ACE_INLINE CORBA::ULong - Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::index (void) const + Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::index () const { return this->index_; } @@ -212,14 +212,14 @@ namespace TAO } template <typename TRANSPORT_DESCRIPTOR_TYPE> ACE_INLINE void - Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::incr_index (void) + Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::incr_index () { ++this->index_; } template <typename TRANSPORT_DESCRIPTOR_TYPE> ACE_INLINE typename Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::transport_descriptor_type * - Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::property (void) const + Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::property () const { return this->transport_property_; } diff --git a/TAO/tao/Cleanup_Func_Registry.cpp b/TAO/tao/Cleanup_Func_Registry.cpp index 5597de7531d..93ef5cb0c8a 100644 --- a/TAO/tao/Cleanup_Func_Registry.cpp +++ b/TAO/tao/Cleanup_Func_Registry.cpp @@ -39,8 +39,8 @@ TAO_Cleanup_Func_Registry::cleanup (ACE_Array_Base <void *> &ts_objects) for (size_t i = 0; i < len; ++i) { ACE_CLEANUP_FUNC destructor = this->cleanup_funcs_[i]; - if (destructor != 0) - destructor (ts_objects[i], 0); + if (destructor != nullptr) + destructor (ts_objects[i], nullptr); } } diff --git a/TAO/tao/Cleanup_Func_Registry.h b/TAO/tao/Cleanup_Func_Registry.h index f3b02cd4b4c..0970e3a39cd 100644 --- a/TAO/tao/Cleanup_Func_Registry.h +++ b/TAO/tao/Cleanup_Func_Registry.h @@ -40,10 +40,10 @@ class TAO_Export TAO_Cleanup_Func_Registry public: /// Constructor. - TAO_Cleanup_Func_Registry (void); + TAO_Cleanup_Func_Registry (); /// Return the number of registered cleanup functions. - size_t size (void) const; + size_t size () const; protected: /// Register a cleanup function. The number of slot the cleanup diff --git a/TAO/tao/ClientRequestInterceptor_Adapter.cpp b/TAO/tao/ClientRequestInterceptor_Adapter.cpp index c5e425c4cd8..40684f17384 100644 --- a/TAO/tao/ClientRequestInterceptor_Adapter.cpp +++ b/TAO/tao/ClientRequestInterceptor_Adapter.cpp @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO::ClientRequestInterceptor_Adapter::~ClientRequestInterceptor_Adapter (void) +TAO::ClientRequestInterceptor_Adapter::~ClientRequestInterceptor_Adapter () { } diff --git a/TAO/tao/ClientRequestInterceptor_Adapter.h b/TAO/tao/ClientRequestInterceptor_Adapter.h index 3ada82f83da..67f3e884033 100644 --- a/TAO/tao/ClientRequestInterceptor_Adapter.h +++ b/TAO/tao/ClientRequestInterceptor_Adapter.h @@ -63,7 +63,7 @@ namespace TAO : public RequestInterceptor_Adapter { public: - virtual ~ClientRequestInterceptor_Adapter (void); + virtual ~ClientRequestInterceptor_Adapter (); /** * @name PortableInterceptor Client Side Interception Points diff --git a/TAO/tao/ClientRequestInterceptor_Adapter_Factory.cpp b/TAO/tao/ClientRequestInterceptor_Adapter_Factory.cpp index 7f0347296a5..a7b9989df41 100644 --- a/TAO/tao/ClientRequestInterceptor_Adapter_Factory.cpp +++ b/TAO/tao/ClientRequestInterceptor_Adapter_Factory.cpp @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_ClientRequestInterceptor_Adapter_Factory::~TAO_ClientRequestInterceptor_Adapter_Factory (void) +TAO_ClientRequestInterceptor_Adapter_Factory::~TAO_ClientRequestInterceptor_Adapter_Factory () { } diff --git a/TAO/tao/ClientRequestInterceptor_Adapter_Factory.h b/TAO/tao/ClientRequestInterceptor_Adapter_Factory.h index 0ca15b73e70..0f514b2e3d1 100644 --- a/TAO/tao/ClientRequestInterceptor_Adapter_Factory.h +++ b/TAO/tao/ClientRequestInterceptor_Adapter_Factory.h @@ -40,9 +40,9 @@ class TAO_Export TAO_ClientRequestInterceptor_Adapter_Factory : public ACE_Service_Object { public: - virtual ~TAO_ClientRequestInterceptor_Adapter_Factory (void); + virtual ~TAO_ClientRequestInterceptor_Adapter_Factory (); - virtual TAO::ClientRequestInterceptor_Adapter *create (void) = 0; + virtual TAO::ClientRequestInterceptor_Adapter *create () = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Client_Strategy_Factory.cpp b/TAO/tao/Client_Strategy_Factory.cpp index 9058c65b2d2..b029deb4e7b 100644 --- a/TAO/tao/Client_Strategy_Factory.cpp +++ b/TAO/tao/Client_Strategy_Factory.cpp @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Client_Strategy_Factory::~TAO_Client_Strategy_Factory (void) +TAO_Client_Strategy_Factory::~TAO_Client_Strategy_Factory () { } diff --git a/TAO/tao/Client_Strategy_Factory.h b/TAO/tao/Client_Strategy_Factory.h index 6ff11c9df61..e59d0ee66ee 100644 --- a/TAO/tao/Client_Strategy_Factory.h +++ b/TAO/tao/Client_Strategy_Factory.h @@ -58,16 +58,16 @@ class TAO_Export TAO_Client_Strategy_Factory : public ACE_Service_Object public: /// Destructor - virtual ~TAO_Client_Strategy_Factory (void); + virtual ~TAO_Client_Strategy_Factory (); /// Create the correct client request muxing strategy. virtual TAO_Transport_Mux_Strategy *create_transport_mux_strategy (TAO_Transport *transport) = 0; /// Create the correct lock for request muxing strategy. - virtual ACE_Lock *create_transport_mux_strategy_lock (void) = 0; + virtual ACE_Lock *create_transport_mux_strategy_lock () = 0; /// Return the size of the reply dispatcher table - virtual int reply_dispatcher_table_size (void) const = 0; + virtual int reply_dispatcher_table_size () const = 0; /// Create the correct client wait_for_reply strategy. virtual TAO_Wait_Strategy *create_wait_strategy (TAO_Transport *transport) = 0; @@ -83,20 +83,20 @@ public: }; /// Return the selected connection strategy option. - virtual Connect_Strategy connect_strategy (void) const = 0; + virtual Connect_Strategy connect_strategy () const = 0; /// Does the client allow any form of callback? - virtual int allow_callback (void) = 0; + virtual int allow_callback () = 0; /// Cleanup options for wait strategy. /** * Only applicable to RW wait strategy */ - virtual bool use_cleanup_options (void) const = 0; + virtual bool use_cleanup_options () const = 0; /// Return the parameters used to optionally retry invocation /// after an exception occurs. - virtual const TAO::Invocation_Retry_Params &invocation_retry_params (void) const = 0; + virtual const TAO::Invocation_Retry_Params &invocation_retry_params () const = 0; /// Return the value to be used as the default sync scope for the ORB virtual Messaging::SyncScope sync_scope () const = 0; diff --git a/TAO/tao/CodecFactory/CodecFactory.h b/TAO/tao/CodecFactory/CodecFactory.h index 80e79b20b7c..36729d3dcb3 100644 --- a/TAO/tao/CodecFactory/CodecFactory.h +++ b/TAO/tao/CodecFactory/CodecFactory.h @@ -38,7 +38,7 @@ public: ACE_TCHAR *argv []); /// Used to force the initialization of the ORB code. - static int Initializer (void); + static int Initializer (); }; static int diff --git a/TAO/tao/Codeset/UTF16_BOM_Translator.cpp b/TAO/tao/Codeset/UTF16_BOM_Translator.cpp index 0d0169cdd11..db3df08c895 100644 --- a/TAO/tao/Codeset/UTF16_BOM_Translator.cpp +++ b/TAO/tao/Codeset/UTF16_BOM_Translator.cpp @@ -170,7 +170,6 @@ ACE_CDR::Boolean TAO_UTF16_BOM_Translator::read_wstring (ACE_InputCDR &cdr, std::wstring &x) { -#if defined (ACE_HAS_CPP11) ACE_CDR::ULong len; if (!this->read_4 (cdr, &len)) return false; @@ -227,9 +226,6 @@ TAO_UTF16_BOM_Translator::read_wstring (ACE_InputCDR &cdr, } x.clear (); return false; -#else - return this->ACE_WChar_Codeset_Translator::read_wstring (cdr, x); -#endif } #endif diff --git a/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp b/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp index 6da6df8f67a..44f03eb740c 100644 --- a/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp +++ b/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp @@ -121,7 +121,6 @@ ACE_CDR::Boolean TAO_UTF8_Latin1_Translator::read_string (ACE_InputCDR &cdr, std::string &x) { -#if defined (ACE_HAS_CPP11) ACE_CDR::ULong len; if (!cdr.read_ulong (len)) return false; @@ -161,9 +160,6 @@ TAO_UTF8_Latin1_Translator::read_string (ACE_InputCDR &cdr, x.clear (); return false; -#else - return this->ACE_Char_Codeset_Translator::read_string (cdr, x); -#endif } ACE_CDR::Boolean diff --git a/TAO/tao/Codeset_Manager.cpp b/TAO/tao/Codeset_Manager.cpp index 1fa161ab63a..318904620d3 100644 --- a/TAO/tao/Codeset_Manager.cpp +++ b/TAO/tao/Codeset_Manager.cpp @@ -4,14 +4,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Codeset_Manager::~TAO_Codeset_Manager (void) +TAO_Codeset_Manager::~TAO_Codeset_Manager () { } // Add the destructor for the codeset_descriptor_base here, because // it is only ever used in conjunction with the codeset manager. -TAO_Codeset_Descriptor_Base::~TAO_Codeset_Descriptor_Base (void) +TAO_Codeset_Descriptor_Base::~TAO_Codeset_Descriptor_Base () { } diff --git a/TAO/tao/Codeset_Manager_Factory_Base.cpp b/TAO/tao/Codeset_Manager_Factory_Base.cpp index a77dfd61797..94aef786b28 100644 --- a/TAO/tao/Codeset_Manager_Factory_Base.cpp +++ b/TAO/tao/Codeset_Manager_Factory_Base.cpp @@ -5,25 +5,25 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Codeset_Manager_Factory_Base::~TAO_Codeset_Manager_Factory_Base (void) +TAO_Codeset_Manager_Factory_Base::~TAO_Codeset_Manager_Factory_Base () { } bool -TAO_Codeset_Manager_Factory_Base::is_default (void) const +TAO_Codeset_Manager_Factory_Base::is_default () const { return true; } TAO_Codeset_Manager * -TAO_Codeset_Manager_Factory_Base::create (void) +TAO_Codeset_Manager_Factory_Base::create () { - return 0; + return nullptr; } int -TAO_Codeset_Manager_Factory_Base::initialize (void) +TAO_Codeset_Manager_Factory_Base::initialize () { return ACE_Service_Config::process_directive (ace_svc_desc_TAO_Codeset_Manager_Factory_Base); diff --git a/TAO/tao/Codeset_Translator_Base.cpp b/TAO/tao/Codeset_Translator_Base.cpp index d269d80a61c..d5b69e09f35 100644 --- a/TAO/tao/Codeset_Translator_Base.cpp +++ b/TAO/tao/Codeset_Translator_Base.cpp @@ -16,7 +16,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Codeset_Translator_Base::~TAO_Codeset_Translator_Base (void) +TAO_Codeset_Translator_Base::~TAO_Codeset_Translator_Base () { } diff --git a/TAO/tao/Collocation_Resolver.cpp b/TAO/tao/Collocation_Resolver.cpp index 2ddca927e09..7492024fb7a 100644 --- a/TAO/tao/Collocation_Resolver.cpp +++ b/TAO/tao/Collocation_Resolver.cpp @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Collocation_Resolver::~TAO_Collocation_Resolver (void) +TAO_Collocation_Resolver::~TAO_Collocation_Resolver () { } diff --git a/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp b/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp index c687786d48b..213f37cb44e 100644 --- a/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp +++ b/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp @@ -20,8 +20,7 @@ Zlib_CompressorFactory::get_compressor ( // Ensure Compression range 0-9 and will also convert -1(default) to 9(max). compression_level = ace_range( ::Compression::CompressionLevel(Z_NO_COMPRESSION), // Min value ::Compression::CompressionLevel(Z_BEST_COMPRESSION), // Max value - compression_level // Argument value - ); + compression_level); // Argument value ::Compression::Compressor_ptr compressor = 0; diff --git a/TAO/tao/Condition.h b/TAO/tao/Condition.h index 0d7a1fd63c4..0b8c59e41b5 100644 --- a/TAO/tao/Condition.h +++ b/TAO/tao/Condition.h @@ -51,10 +51,10 @@ public: /// A default constructor. Since no lock is provided by the user, /// one will be created internally. - TAO_Condition (void); + TAO_Condition (); /// Implicitly destroy the condition variable. - ~TAO_Condition (void); + ~TAO_Condition (); // = Lock accessors. /** @@ -66,7 +66,7 @@ public: int wait (const ACE_Time_Value *abstime); /// Block on condition. - int wait (void); + int wait (); /** * Block on condition or until absolute time-of-day has passed. If @@ -79,17 +79,17 @@ public: int wait (MUTEX &mutex, const ACE_Time_Value *abstime = 0); /// Signal one waiting thread. - int signal (void); + int signal (); /// Signal *all* waiting threads. - int broadcast (void); + int broadcast (); // = Utility methods. /// Explicitly destroy the condition variable. - int remove (void); + int remove (); /// Returns a reference to the underlying mutex_; - MUTEX *mutex (void); + MUTEX *mutex (); private: ACE_UNIMPLEMENTED_FUNC (TAO_Condition (const TAO_Condition<MUTEX> &)) diff --git a/TAO/tao/Connect_Strategy.cpp b/TAO/tao/Connect_Strategy.cpp index 1410e5f1fcd..5f5496f9756 100644 --- a/TAO/tao/Connect_Strategy.cpp +++ b/TAO/tao/Connect_Strategy.cpp @@ -12,7 +12,7 @@ TAO_Connect_Strategy::TAO_Connect_Strategy (TAO_ORB_Core *orb_core) } -TAO_Connect_Strategy::~TAO_Connect_Strategy (void) +TAO_Connect_Strategy::~TAO_Connect_Strategy () { } @@ -20,7 +20,7 @@ int TAO_Connect_Strategy::wait (TAO_Connection_Handler *ch, ACE_Time_Value *max_wait_time) { - if (ch == 0) + if (ch == nullptr) return -1; return this->wait_i (ch, ch->transport (), max_wait_time); @@ -32,7 +32,7 @@ TAO_Connect_Strategy::wait (TAO_Transport *t, ACE_Time_Value *max_wait_time) // Basically the connection was EINPROGRESS, but before we could // wait for it some other thread detected a failure and cleaned up // the connection handler. - if (t == 0) + if (t == nullptr) return -1; return this->wait_i (t->connection_handler (), t, max_wait_time); diff --git a/TAO/tao/Connection_Handler.cpp b/TAO/tao/Connection_Handler.cpp index 728338137c6..6c0520aed30 100644 --- a/TAO/tao/Connection_Handler.cpp +++ b/TAO/tao/Connection_Handler.cpp @@ -11,8 +11,6 @@ #include "ace/os_include/sys/os_socket.h" #include "ace/Svc_Handler.h" -//@@ CONNECTION_HANDLER_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK - #if !defined (__ACE_INLINE__) #include "tao/Connection_Handler.inl" #endif /* __ACE_INLINE__ */ @@ -21,7 +19,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Connection_Handler::TAO_Connection_Handler (TAO_ORB_Core *orb_core) : orb_core_ (orb_core), - transport_ (0), + transport_ (nullptr), connection_pending_ (false), is_closed_ (false) { @@ -31,13 +29,12 @@ TAO_Connection_Handler::TAO_Connection_Handler (TAO_ORB_Core *orb_core) this->orb_core_->leader_follower ()); } -TAO_Connection_Handler::~TAO_Connection_Handler (void) +TAO_Connection_Handler::~TAO_Connection_Handler () { - //@@ CONNECTION_HANDLER_DESTRUCTOR_ADD_HOOK } int -TAO_Connection_Handler::shared_open (void) +TAO_Connection_Handler::shared_open () { // This reference counting is related to asynch connections. It // should probably be managed by the ACE_Strategy_Connector, since @@ -104,7 +101,7 @@ TAO_Connection_Handler::set_socket_option (ACE_SOCK &sock, } int -TAO_Connection_Handler::svc_i (void) +TAO_Connection_Handler::svc_i () { int result = 0; @@ -116,7 +113,7 @@ TAO_Connection_Handler::svc_i (void) // in a reactive handler, except that this can simply block waiting // for input. - ACE_Time_Value *max_wait_time = 0; + ACE_Time_Value *max_wait_time = nullptr; ACE_Time_Value timeout; ACE_Time_Value current_timeout; @@ -350,13 +347,13 @@ TAO_Connection_Handler::close_connection_eh (ACE_Event_Handler *eh) { // If the ORB is nil, get the reactor from orb_core which gets it // from LF. - if (eh_reactor == 0) + if (eh_reactor == nullptr) eh_reactor = this->transport()->orb_core()->reactor (); } // The Reactor must not be null, otherwise something else is // horribly broken. - ACE_ASSERT (eh_reactor != 0); + ACE_ASSERT (eh_reactor != nullptr); if (TAO_debug_level) { @@ -418,15 +415,6 @@ TAO_Connection_Handler::close_connection_eh (ACE_Event_Handler *eh) return 1; } -/* - * Comment hook to comment the base class implementations - * that do nothing. Specialized versions from derived - * class will directly override these methods. Add - * all methods that are virtual, have do nothing implementations - * within this hook for later specialization. - */ -//@@ CONNECTION_HANDLER_SPL_COMMENT_HOOK_START - int TAO_Connection_Handler::set_dscp_codepoint (CORBA::Boolean) { @@ -440,13 +428,11 @@ TAO_Connection_Handler::set_dscp_codepoint (CORBA::Long) } int -TAO_Connection_Handler::release_os_resources (void) +TAO_Connection_Handler::release_os_resources () { return 0; } -//@@ CONNECTION_HANDLER_SPL_COMMENT_HOOK_END - void TAO_Connection_Handler::pre_io_hook (int &) { @@ -477,6 +463,4 @@ TAO_Connection_Handler::close_handler (u_long) return 0; } -//@@ CONNECTION_HANDLER_SPL_METHODS_ADD_HOOK - TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Connection_Handler.h b/TAO/tao/Connection_Handler.h index a76506d7ceb..6e7c768030a 100644 --- a/TAO/tao/Connection_Handler.h +++ b/TAO/tao/Connection_Handler.h @@ -33,12 +33,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_ORB_Core; class TAO_Transport; -/* - * Hook to specialize the connection handler with the - * concrete connection handler implementation. - */ -//@@ CONNECTION_HANDLER_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK - /** * @class TAO_Connection_Handler * @@ -132,13 +126,6 @@ public: virtual int handle_write_ready (const ACE_Time_Value *timeout); - /* - * Hook to add public methods from concrete connection handler - * implementation onto the base connection handler. - */ - - //@@ CONNECTION_HANDLER_SPL_PUBLIC_METHODS_ADD_HOOK - protected: /// Return our TAO_ORB_Core pointer TAO_ORB_Core *orb_core (void); @@ -208,19 +195,8 @@ private: /// Once closed make sure the transport is not added back to the cache. /// This is distinct from the leader-follower state so it cannot be reset. bool is_closed_; - - /* - * Hook to add instance members from derived class - * onto base Connection_Handler class. Any further - * additions to this class should go before this - * hook. - */ - //@@ CONNECTION_HANDLER_SPL_PRIVATE_DATA_ADD_HOOK }; -//@@ CONNECTION_HANDLER_SPL_EXTERN_ADD_HOOK - - /** * @class TAO_Auto_Reference * diff --git a/TAO/tao/Connection_Handler.inl b/TAO/tao/Connection_Handler.inl index a6c8dc8b242..f143c25b53e 100644 --- a/TAO/tao/Connection_Handler.inl +++ b/TAO/tao/Connection_Handler.inl @@ -69,6 +69,4 @@ TAO_Connection_Handler::handle_write_ready (const ACE_Time_Value *) return 0; } -//@@ CONNECTION_HANDLER_SPL_METHODS_ADD_HOOK - TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Connection_Purging_Strategy.cpp b/TAO/tao/Connection_Purging_Strategy.cpp index b6eface5905..ecdc639fbe4 100644 --- a/TAO/tao/Connection_Purging_Strategy.cpp +++ b/TAO/tao/Connection_Purging_Strategy.cpp @@ -6,12 +6,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Connection_Purging_Strategy::~TAO_Connection_Purging_Strategy (void) +TAO_Connection_Purging_Strategy::~TAO_Connection_Purging_Strategy () { } int -TAO_Connection_Purging_Strategy::cache_maximum (void) const +TAO_Connection_Purging_Strategy::cache_maximum () const { return cache_maximum_; } diff --git a/TAO/tao/Connection_Purging_Strategy.h b/TAO/tao/Connection_Purging_Strategy.h index dc790a99e80..845b8222ffb 100644 --- a/TAO/tao/Connection_Purging_Strategy.h +++ b/TAO/tao/Connection_Purging_Strategy.h @@ -42,10 +42,10 @@ public: TAO_Connection_Purging_Strategy (int cache_maximum); /// The destructor - virtual ~TAO_Connection_Purging_Strategy (void); + virtual ~TAO_Connection_Purging_Strategy (); /// Return the maximum number of cache entries - virtual int cache_maximum (void) const; + virtual int cache_maximum () const; /// Sub-classes must implement these methods virtual void update_item (TAO_Transport& transport) = 0; diff --git a/TAO/tao/Connector_Registry.cpp b/TAO/tao/Connector_Registry.cpp index 9df7f6418fc..6de1485a595 100644 --- a/TAO/tao/Connector_Registry.cpp +++ b/TAO/tao/Connector_Registry.cpp @@ -15,13 +15,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Connector_Registry::TAO_Connector_Registry (void) - : connectors_ (0), +TAO_Connector_Registry::TAO_Connector_Registry () + : connectors_ (nullptr), size_ (0) { } -TAO_Connector_Registry::~TAO_Connector_Registry (void) +TAO_Connector_Registry::~TAO_Connector_Registry () { this->close_all (); @@ -41,7 +41,7 @@ TAO_Connector_Registry::get_connector (CORBA::ULong tag) const return *connector; } - return 0; + return nullptr; } int @@ -52,7 +52,7 @@ TAO_Connector_Registry::open (TAO_ORB_Core *orb_core) // The array containing the TAO_Connectors will never contain more // than the number of loaded protocols in the ORB core. - if (this->connectors_ == 0) + if (this->connectors_ == nullptr) ACE_NEW_RETURN (this->connectors_, TAO_Connector *[pfs->size ()], -1); @@ -64,11 +64,7 @@ TAO_Connector_Registry::open (TAO_ORB_Core *orb_core) factory != end; ++factory) { -#if defined (ACE_HAS_CPP11) std::unique_ptr <TAO_Connector> connector ((*factory)->factory ()->make_connector ()); -#else - auto_ptr <TAO_Connector> connector ((*factory)->factory ()->make_connector ()); -#endif /* ACE_HAS_CPP11 */ if (connector.get ()) { @@ -92,7 +88,7 @@ TAO_Connector_Registry::open (TAO_ORB_Core *orb_core) } int -TAO_Connector_Registry::close_all (void) +TAO_Connector_Registry::close_all () { const TAO_ConnectorSetIterator end = this->end (); @@ -100,7 +96,7 @@ TAO_Connector_Registry::close_all (void) i != end; ++i) { - if (*i == 0) + if (*i == nullptr) continue; (*i)->close (); @@ -115,8 +111,7 @@ TAO_Connector_Registry::close_all (void) int TAO_Connector_Registry::make_mprofile (const char *ior, - TAO_MProfile &mprofile - ) + TAO_MProfile &mprofile) { if (!ior) // Failure: Null IOR string pointer @@ -137,8 +132,7 @@ TAO_Connector_Registry::make_mprofile (const char *ior, { const int mp_result = (*connector)->make_mprofile (ior, - mprofile - ); + mprofile); if (mp_result == 0) return 0; // Success @@ -172,13 +166,13 @@ TAO_Connector_Registry::create_profile (TAO_InputCDR &cdr) TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - TAO_Connector_Registry::") ACE_TEXT ("create_profile: Unable to extract tag from CDR stream\n"))); - return 0; + return nullptr; } TAO_Connector *connector = this->get_connector (tag); - if (connector == 0) + if (connector == nullptr) { if (TAO_debug_level > 0) { @@ -189,7 +183,7 @@ TAO_Connector_Registry::create_profile (TAO_InputCDR &cdr) } TAO_ORB_Core *orb_core = cdr.orb_core (); - if (orb_core == 0) + if (orb_core == nullptr) { orb_core = TAO_ORB_Core_instance (); if (TAO_debug_level > 0) @@ -202,18 +196,18 @@ TAO_Connector_Registry::create_profile (TAO_InputCDR &cdr) } } - TAO_Profile *pfile = 0; + TAO_Profile *pfile = nullptr; ACE_NEW_RETURN (pfile, TAO_Unknown_Profile (tag, orb_core), - 0); + nullptr); if (pfile->decode (cdr) == -1) { TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - TAO_Connector_Registry::") ACE_TEXT ("create_profile: Unable to decode unknown profile from CDR stream\n"))); pfile->_decr_refcnt (); - pfile = 0; + pfile = nullptr; } return pfile; @@ -231,7 +225,7 @@ TAO_Connector_Registry::create_profile (TAO_InputCDR &cdr) TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - TAO_Connector_Registry::") ACE_TEXT ("create_profile: Unable to extract encapsulated length from CDR stream\n"))); - return 0; + return nullptr; } // Create the decoding stream from the encapsulation in the buffer, @@ -243,7 +237,7 @@ TAO_Connector_Registry::create_profile (TAO_InputCDR &cdr) TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - TAO_Connector_Registry::") ACE_TEXT ("create_profile: Unable to skip encapsulated stream from CDR stream\n"))); - return 0; + return nullptr; } TAO_Profile* profile = connector->create_profile (str); diff --git a/TAO/tao/Connector_Registry.h b/TAO/tao/Connector_Registry.h index f9ff5707a93..6a644e300f8 100644 --- a/TAO/tao/Connector_Registry.h +++ b/TAO/tao/Connector_Registry.h @@ -81,9 +81,10 @@ public: TAO_ConnectorSetIterator end (void) const; private: - // Disallow copying and assignment. - TAO_Connector_Registry (const TAO_Connector_Registry&); - void operator= (const TAO_Connector_Registry&); + TAO_Connector_Registry (const TAO_Connector_Registry&) = delete; + void operator= (const TAO_Connector_Registry&) = delete; + TAO_Connector_Registry (TAO_Connector_Registry&&) = delete; + void operator= (TAO_Connector_Registry&&) = delete; private: /// List of connectors that are currently open. diff --git a/TAO/tao/DLL_Parser.cpp b/TAO/tao/DLL_Parser.cpp index 7666e20d18e..2575c276fcb 100644 --- a/TAO/tao/DLL_Parser.cpp +++ b/TAO/tao/DLL_Parser.cpp @@ -16,7 +16,7 @@ static const char dll_prefix[] = "DLL:"; TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_DLL_Parser::~TAO_DLL_Parser (void) +TAO_DLL_Parser::~TAO_DLL_Parser () { } @@ -44,7 +44,7 @@ TAO_DLL_Parser::parse_string (const char *ior, ACE_Dynamic_Service<TAO_Object_Loader>::instance (oc->configuration(), name); - if (loader == 0) + if (loader == nullptr) { throw CORBA::INV_OBJREF @@ -54,7 +54,7 @@ TAO_DLL_Parser::parse_string (const char *ior, CORBA::COMPLETED_NO); } - return loader->create_object (orb, 0, 0); + return loader->create_object (orb, 0, nullptr); } diff --git a/TAO/tao/Default_Endpoint_Selector_Factory.cpp b/TAO/tao/Default_Endpoint_Selector_Factory.cpp index a0f5c95d070..0831fb9a654 100644 --- a/TAO/tao/Default_Endpoint_Selector_Factory.cpp +++ b/TAO/tao/Default_Endpoint_Selector_Factory.cpp @@ -6,19 +6,19 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Default_Endpoint_Selector_Factory::TAO_Default_Endpoint_Selector_Factory ( - void) + ) : default_endpoint_selector_ (new TAO_Default_Endpoint_Selector) { } -TAO_Default_Endpoint_Selector_Factory::~TAO_Default_Endpoint_Selector_Factory (void) +TAO_Default_Endpoint_Selector_Factory::~TAO_Default_Endpoint_Selector_Factory () { delete this->default_endpoint_selector_; } TAO_Invocation_Endpoint_Selector * -TAO_Default_Endpoint_Selector_Factory::get_selector (void) +TAO_Default_Endpoint_Selector_Factory::get_selector () { // Trivial endpoint selector. Just return the default selector. return this->default_endpoint_selector_; diff --git a/TAO/tao/Default_Stub_Factory.cpp b/TAO/tao/Default_Stub_Factory.cpp index ee2fa4090c8..ed4cd6f6d3c 100644 --- a/TAO/tao/Default_Stub_Factory.cpp +++ b/TAO/tao/Default_Stub_Factory.cpp @@ -8,7 +8,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Default_Stub_Factory::~TAO_Default_Stub_Factory (void) +TAO_Default_Stub_Factory::~TAO_Default_Stub_Factory () { } @@ -17,7 +17,7 @@ TAO_Default_Stub_Factory::create_stub (const char *repository_id, const TAO_MProfile &profiles, TAO_ORB_Core *orb_core) { - TAO_Stub *retval = 0; + TAO_Stub *retval = nullptr; ACE_NEW_THROW_EX (retval, TAO_Stub (repository_id, profiles, orb_core), diff --git a/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp b/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp index 2715e7a9a63..dd5dced5afc 100644 --- a/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp +++ b/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp @@ -13,14 +13,14 @@ TAO_Default_Thread_Lane_Resources_Manager::TAO_Default_Thread_Lane_Resources_Man { } -TAO_Default_Thread_Lane_Resources_Manager::~TAO_Default_Thread_Lane_Resources_Manager (void) +TAO_Default_Thread_Lane_Resources_Manager::~TAO_Default_Thread_Lane_Resources_Manager () { // Delete the default resources. delete this->lane_resources_; } int -TAO_Default_Thread_Lane_Resources_Manager::open_default_resources (void) +TAO_Default_Thread_Lane_Resources_Manager::open_default_resources () { TAO_ORB_Parameters * const params = this->orb_core_->orb_params (); @@ -38,32 +38,32 @@ TAO_Default_Thread_Lane_Resources_Manager::open_default_resources (void) } void -TAO_Default_Thread_Lane_Resources_Manager::finalize (void) +TAO_Default_Thread_Lane_Resources_Manager::finalize () { // Finalize default resources. this->lane_resources_->finalize (); } TAO_Thread_Lane_Resources & -TAO_Default_Thread_Lane_Resources_Manager::lane_resources (void) +TAO_Default_Thread_Lane_Resources_Manager::lane_resources () { return *this->lane_resources_; } TAO_Thread_Lane_Resources & -TAO_Default_Thread_Lane_Resources_Manager::default_lane_resources (void) +TAO_Default_Thread_Lane_Resources_Manager::default_lane_resources () { return this->lane_resources (); } void -TAO_Default_Thread_Lane_Resources_Manager::shutdown_reactor (void) +TAO_Default_Thread_Lane_Resources_Manager::shutdown_reactor () { this->lane_resources_->shutdown_reactor (); } void -TAO_Default_Thread_Lane_Resources_Manager::close_all_transports (void) +TAO_Default_Thread_Lane_Resources_Manager::close_all_transports () { this->lane_resources_->close_all_transports (); } @@ -77,19 +77,19 @@ TAO_Default_Thread_Lane_Resources_Manager::is_collocated (const TAO_MProfile &mp // ------------------------------------------------------- TAO_Default_Thread_Lane_Resources_Manager_Factory:: -~TAO_Default_Thread_Lane_Resources_Manager_Factory (void) +~TAO_Default_Thread_Lane_Resources_Manager_Factory () { } TAO_Thread_Lane_Resources_Manager * TAO_Default_Thread_Lane_Resources_Manager_Factory::create_thread_lane_resources_manager (TAO_ORB_Core &core) { - TAO_Thread_Lane_Resources_Manager *manager = 0; + TAO_Thread_Lane_Resources_Manager *manager = nullptr; /// Create the Default Thread Lane Resources Manager. ACE_NEW_RETURN (manager, TAO_Default_Thread_Lane_Resources_Manager (core), - 0); + nullptr); return manager; } diff --git a/TAO/tao/DynamicAny/DynAnyFactory.cpp b/TAO/tao/DynamicAny/DynAnyFactory.cpp index c741c9d4f56..eb03d1253a7 100644 --- a/TAO/tao/DynamicAny/DynAnyFactory.cpp +++ b/TAO/tao/DynamicAny/DynAnyFactory.cpp @@ -24,7 +24,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Constructor from typecode -TAO_DynAnyFactory::TAO_DynAnyFactory (void) +TAO_DynAnyFactory::TAO_DynAnyFactory () { } diff --git a/TAO/tao/DynamicAny/DynAnyFactory.h b/TAO/tao/DynamicAny/DynAnyFactory.h index 22c902b6f5d..08864b9686e 100644 --- a/TAO/tao/DynamicAny/DynAnyFactory.h +++ b/TAO/tao/DynamicAny/DynAnyFactory.h @@ -39,7 +39,7 @@ class TAO_DynamicAny_Export TAO_DynAnyFactory { public: /// Constructor. - TAO_DynAnyFactory (void); + TAO_DynAnyFactory (); // = The DynamicAnyFactory methods. virtual DynamicAny::DynAny_ptr create_dyn_any (const CORBA::Any & value); diff --git a/TAO/tao/DynamicAny/DynAny_i.cpp b/TAO/tao/DynamicAny/DynAny_i.cpp index bdca250de2c..3506b030283 100644 --- a/TAO/tao/DynamicAny/DynAny_i.cpp +++ b/TAO/tao/DynamicAny/DynAny_i.cpp @@ -20,7 +20,7 @@ TAO_DynAny_i::TAO_DynAny_i (CORBA::Boolean allow_truncation) { } -TAO_DynAny_i::~TAO_DynAny_i (void) +TAO_DynAny_i::~TAO_DynAny_i () { } @@ -165,7 +165,7 @@ TAO_DynAny_i::set_to_default_value (CORBA::TypeCode_ptr tc) } void -TAO_DynAny_i::init_common (void) +TAO_DynAny_i::init_common () { this->ref_to_component_ = false; this->container_is_destroying_ = false; @@ -236,7 +236,7 @@ TAO_DynAny_i::from_any (const CORBA::Any &any) } CORBA::Any_ptr -TAO_DynAny_i::to_any (void) +TAO_DynAny_i::to_any () { if (this->destroyed_) { @@ -794,7 +794,7 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs) } void -TAO_DynAny_i::destroy (void) +TAO_DynAny_i::destroy () { if (this->destroyed_) { @@ -809,7 +809,7 @@ TAO_DynAny_i::destroy (void) DynamicAny::DynAny_ptr -TAO_DynAny_i::current_component (void) +TAO_DynAny_i::current_component () { if (this->destroyed_) { diff --git a/TAO/tao/DynamicAny/DynAny_i.h b/TAO/tao/DynamicAny/DynAny_i.h index 2488649d5b4..5530cf49d8e 100644 --- a/TAO/tao/DynamicAny/DynAny_i.h +++ b/TAO/tao/DynamicAny/DynAny_i.h @@ -43,7 +43,7 @@ public: TAO_DynAny_i (CORBA::Boolean allow_truncation=true); /// Destructor. - ~TAO_DynAny_i (void); + ~TAO_DynAny_i (); /// Initialize using just a TypeCode void init (CORBA::TypeCode_ptr tc); @@ -58,13 +58,13 @@ public: virtual void from_any (const CORBA::Any & value); - virtual CORBA::Any * to_any (void); + virtual CORBA::Any * to_any (); virtual CORBA::Boolean equal (DynamicAny::DynAny_ptr dyn_any); - virtual void destroy (void); + virtual void destroy (); - virtual DynamicAny::DynAny_ptr current_component (void); + virtual DynamicAny::DynAny_ptr current_component (); private: /// Check if the typecode is acceptable. @@ -74,7 +74,7 @@ private: void set_to_default_value (CORBA::TypeCode_ptr tc); /// Called by both versions of init(). - void init_common (void); + void init_common (); // Use copy() or assign() instead of these. TAO_DynAny_i (const TAO_DynAny_i &src); diff --git a/TAO/tao/DynamicAny/DynArray_i.cpp b/TAO/tao/DynamicAny/DynArray_i.cpp index c70f37b1763..574102cc3b2 100644 --- a/TAO/tao/DynamicAny/DynArray_i.cpp +++ b/TAO/tao/DynamicAny/DynArray_i.cpp @@ -16,12 +16,12 @@ TAO_DynArray_i::TAO_DynArray_i (CORBA::Boolean allow_truncation) { } -TAO_DynArray_i::~TAO_DynArray_i (void) +TAO_DynArray_i::~TAO_DynArray_i () { } void -TAO_DynArray_i::init_common (void) +TAO_DynArray_i::init_common () { this->ref_to_component_ = false; this->container_is_destroying_ = false; @@ -131,7 +131,7 @@ TAO_DynArray_i::init (CORBA::TypeCode_ptr tc) } CORBA::TypeCode_ptr -TAO_DynArray_i::get_element_type (void) +TAO_DynArray_i::get_element_type () { CORBA::TypeCode_var element_type = CORBA::TypeCode::_duplicate (this->type_.in ()); @@ -182,7 +182,7 @@ TAO_DynArray_i::_narrow (CORBA::Object_ptr _tao_objref) // **************************************************************** DynamicAny::AnySeq * -TAO_DynArray_i::get_elements (void) +TAO_DynArray_i::get_elements () { if (this->destroyed_) { @@ -255,7 +255,7 @@ TAO_DynArray_i::set_elements (const DynamicAny::AnySeq & value) } DynamicAny::DynAnySeq * -TAO_DynArray_i::get_elements_as_dyn_any (void) +TAO_DynArray_i::get_elements_as_dyn_any () { if (this->destroyed_) { @@ -401,7 +401,7 @@ TAO_DynArray_i::from_any (const CORBA::Any& any) } CORBA::Any_ptr -TAO_DynArray_i::to_any (void) +TAO_DynArray_i::to_any () { if (this->destroyed_) { @@ -501,7 +501,7 @@ TAO_DynArray_i::equal (DynamicAny::DynAny_ptr rhs) } void -TAO_DynArray_i::destroy (void) +TAO_DynArray_i::destroy () { if (this->destroyed_) { @@ -523,7 +523,7 @@ TAO_DynArray_i::destroy (void) } DynamicAny::DynAny_ptr -TAO_DynArray_i::current_component (void) +TAO_DynArray_i::current_component () { if (this->destroyed_) { diff --git a/TAO/tao/DynamicAny/DynArray_i.h b/TAO/tao/DynamicAny/DynArray_i.h index 6a512602212..01cb6eb8447 100644 --- a/TAO/tao/DynamicAny/DynArray_i.h +++ b/TAO/tao/DynamicAny/DynArray_i.h @@ -45,7 +45,7 @@ public: TAO_DynArray_i (CORBA::Boolean allow_truncation=true); /// Destructor. - ~TAO_DynArray_i (void); + ~TAO_DynArray_i (); /// Initialize using just a TypeCode. void init (CORBA::TypeCode_ptr tc); @@ -58,11 +58,11 @@ public: // = Functions specific to DynArray. - virtual DynamicAny::AnySeq * get_elements (void); + virtual DynamicAny::AnySeq * get_elements (); virtual void set_elements (const DynamicAny::AnySeq & value); - virtual DynamicAny::DynAnySeq * get_elements_as_dyn_any (void); + virtual DynamicAny::DynAnySeq * get_elements_as_dyn_any (); virtual void set_elements_as_dyn_any (const DynamicAny::DynAnySeq & value); @@ -70,23 +70,23 @@ public: virtual void from_any (const CORBA::Any & value); - virtual CORBA::Any * to_any (void); + virtual CORBA::Any * to_any (); virtual CORBA::Boolean equal (DynamicAny::DynAny_ptr dyn_any); - virtual void destroy (void); + virtual void destroy (); - virtual DynamicAny::DynAny_ptr current_component (void); + virtual DynamicAny::DynAny_ptr current_component (); private: /// Returns the type of elements contained in the array. - CORBA::TypeCode_ptr get_element_type (void); + CORBA::TypeCode_ptr get_element_type (); /// Gets the length of the array from the typecode. CORBA::ULong get_tc_length (CORBA::TypeCode_ptr tc); /// Called by both versions of init(). - void init_common (void); + void init_common (); // Use copy() or assign() instead of these. TAO_DynArray_i (const TAO_DynArray_i &src); diff --git a/TAO/tao/DynamicAny/DynCommon.cpp b/TAO/tao/DynamicAny/DynCommon.cpp index 55492e790c3..d101bd51339 100644 --- a/TAO/tao/DynamicAny/DynCommon.cpp +++ b/TAO/tao/DynamicAny/DynCommon.cpp @@ -34,12 +34,12 @@ TAO_DynCommon::TAO_DynCommon (CORBA::Boolean allow_truncation) { } -TAO_DynCommon::~TAO_DynCommon (void) +TAO_DynCommon::~TAO_DynCommon () { } CORBA::TypeCode_ptr -TAO_DynCommon::type (void) +TAO_DynCommon::type () { if (this->destroyed_) { @@ -395,61 +395,61 @@ TAO_DynCommon::insert_val (CORBA::ValueBase *value) // **************************************************************** CORBA::Boolean -TAO_DynCommon::get_boolean (void) +TAO_DynCommon::get_boolean () { return TAO::DynAnyBasicTypeUtils<CORBA::Boolean>::get_value (this); } CORBA::Octet -TAO_DynCommon::get_octet (void) +TAO_DynCommon::get_octet () { return TAO::DynAnyBasicTypeUtils<CORBA::Octet>::get_value (this); } CORBA::Char -TAO_DynCommon::get_char (void) +TAO_DynCommon::get_char () { return TAO::DynAnyBasicTypeUtils<CORBA::Char>::get_value (this); } CORBA::Short -TAO_DynCommon::get_short (void) +TAO_DynCommon::get_short () { return TAO::DynAnyBasicTypeUtils<CORBA::Short>::get_value (this); } CORBA::UShort -TAO_DynCommon::get_ushort (void) +TAO_DynCommon::get_ushort () { return TAO::DynAnyBasicTypeUtils<CORBA::UShort>::get_value (this); } CORBA::Long -TAO_DynCommon::get_long (void) +TAO_DynCommon::get_long () { return TAO::DynAnyBasicTypeUtils<CORBA::Long>::get_value (this); } CORBA::ULong -TAO_DynCommon::get_ulong (void) +TAO_DynCommon::get_ulong () { return TAO::DynAnyBasicTypeUtils<CORBA::ULong>::get_value (this); } CORBA::Float -TAO_DynCommon::get_float (void) +TAO_DynCommon::get_float () { return TAO::DynAnyBasicTypeUtils<CORBA::Float>::get_value (this); } CORBA::Double -TAO_DynCommon::get_double (void) +TAO_DynCommon::get_double () { return TAO::DynAnyBasicTypeUtils<CORBA::Double>::get_value (this); } char * -TAO_DynCommon::get_string (void) +TAO_DynCommon::get_string () { if (this->destroyed_) { @@ -493,7 +493,7 @@ TAO_DynCommon::get_string (void) } CORBA::Object_ptr -TAO_DynCommon::get_reference (void) +TAO_DynCommon::get_reference () { if (this->destroyed_) { @@ -521,7 +521,7 @@ TAO_DynCommon::get_reference (void) } CORBA::TypeCode_ptr -TAO_DynCommon::get_typecode (void) +TAO_DynCommon::get_typecode () { if (this->destroyed_) { @@ -548,25 +548,25 @@ TAO_DynCommon::get_typecode (void) } CORBA::LongLong -TAO_DynCommon::get_longlong (void) +TAO_DynCommon::get_longlong () { return TAO::DynAnyBasicTypeUtils<CORBA::LongLong>::get_value (this); } CORBA::ULongLong -TAO_DynCommon::get_ulonglong (void) +TAO_DynCommon::get_ulonglong () { return TAO::DynAnyBasicTypeUtils<CORBA::ULongLong>::get_value (this); } CORBA::LongDouble -TAO_DynCommon::get_longdouble (void) +TAO_DynCommon::get_longdouble () { return TAO::DynAnyBasicTypeUtils<CORBA::LongDouble>::get_value (this); } CORBA::WChar -TAO_DynCommon::get_wchar (void) +TAO_DynCommon::get_wchar () { if (this->destroyed_) { @@ -593,7 +593,7 @@ TAO_DynCommon::get_wchar (void) } CORBA::WChar * -TAO_DynCommon::get_wstring (void) +TAO_DynCommon::get_wstring () { if (this->destroyed_) { @@ -627,7 +627,7 @@ TAO_DynCommon::get_wstring (void) } CORBA::Any_ptr -TAO_DynCommon::get_any (void) +TAO_DynCommon::get_any () { if (this->destroyed_) { @@ -661,7 +661,7 @@ TAO_DynCommon::get_any (void) // @@@ (JP) TODO - optimize - this version was intended by the OMG to // have fewer Any/DynAny conversions than get_any, not more. DynamicAny::DynAny_ptr -TAO_DynCommon::get_dyn_any (void) +TAO_DynCommon::get_dyn_any () { if (this->destroyed_) { @@ -678,7 +678,7 @@ TAO_DynCommon::get_dyn_any (void) } CORBA::ValueBase * -TAO_DynCommon::get_val (void) +TAO_DynCommon::get_val () { if (this->destroyed_) { @@ -733,8 +733,7 @@ TAO_DynCommon::get_val (void) // **************************************************************** CORBA::Boolean -TAO_DynCommon::seek (CORBA::Long slot - ) +TAO_DynCommon::seek (CORBA::Long slot) { if (this->destroyed_) { @@ -760,7 +759,7 @@ TAO_DynCommon::seek (CORBA::Long slot } void -TAO_DynCommon::rewind (void) +TAO_DynCommon::rewind () { if (this->destroyed_) { @@ -771,7 +770,7 @@ TAO_DynCommon::rewind (void) } CORBA::Boolean -TAO_DynCommon::next (void) +TAO_DynCommon::next () { if (this->destroyed_) { @@ -794,7 +793,7 @@ TAO_DynCommon::next (void) } DynamicAny::DynAny_ptr -TAO_DynCommon::copy (void) +TAO_DynCommon::copy () { if (this->destroyed_) { @@ -813,7 +812,7 @@ TAO_DynCommon::copy (void) } CORBA::ULong -TAO_DynCommon::component_count (void) +TAO_DynCommon::component_count () { if (this->destroyed_) { @@ -899,7 +898,7 @@ TAO_DynCommon::insert_abstract (CORBA::AbstractBase_ptr value) } CORBA::AbstractBase_ptr -TAO_DynCommon::get_abstract (void) +TAO_DynCommon::get_abstract () { if (this->destroyed_) { @@ -1032,7 +1031,7 @@ TAO_DynCommon::insert_wchar_seq (const CORBA::WCharSeq &value) // **************************************************************** CORBA::BooleanSeq * -TAO_DynCommon::get_boolean_seq (void) +TAO_DynCommon::get_boolean_seq () { const CORBA::BooleanSeq *owned = TAO::DynAnyBasicTypeUtils<CORBA::BooleanSeq>::get_value (this); @@ -1040,7 +1039,7 @@ TAO_DynCommon::get_boolean_seq (void) } CORBA::OctetSeq * -TAO_DynCommon::get_octet_seq (void) +TAO_DynCommon::get_octet_seq () { const CORBA::OctetSeq *owned = TAO::DynAnyBasicTypeUtils<CORBA::OctetSeq>::get_value (this); @@ -1048,7 +1047,7 @@ TAO_DynCommon::get_octet_seq (void) } CORBA::CharSeq * -TAO_DynCommon::get_char_seq (void) +TAO_DynCommon::get_char_seq () { const CORBA::CharSeq *owned = TAO::DynAnyBasicTypeUtils<CORBA::CharSeq>::get_value (this); @@ -1056,7 +1055,7 @@ TAO_DynCommon::get_char_seq (void) } CORBA::ShortSeq * -TAO_DynCommon::get_short_seq (void) +TAO_DynCommon::get_short_seq () { const CORBA::ShortSeq *owned = TAO::DynAnyBasicTypeUtils<CORBA::ShortSeq>::get_value (this); @@ -1064,7 +1063,7 @@ TAO_DynCommon::get_short_seq (void) } CORBA::UShortSeq * -TAO_DynCommon::get_ushort_seq (void) +TAO_DynCommon::get_ushort_seq () { const CORBA::UShortSeq *owned = TAO::DynAnyBasicTypeUtils<CORBA::UShortSeq>::get_value (this); @@ -1072,7 +1071,7 @@ TAO_DynCommon::get_ushort_seq (void) } CORBA::LongSeq * -TAO_DynCommon::get_long_seq (void) +TAO_DynCommon::get_long_seq () { const CORBA::LongSeq *owned = TAO::DynAnyBasicTypeUtils<CORBA::LongSeq>::get_value (this); @@ -1080,7 +1079,7 @@ TAO_DynCommon::get_long_seq (void) } CORBA::ULongSeq * -TAO_DynCommon::get_ulong_seq (void) +TAO_DynCommon::get_ulong_seq () { const CORBA::ULongSeq *owned = TAO::DynAnyBasicTypeUtils<CORBA::ULongSeq>::get_value (this); @@ -1088,7 +1087,7 @@ TAO_DynCommon::get_ulong_seq (void) } CORBA::FloatSeq * -TAO_DynCommon::get_float_seq (void) +TAO_DynCommon::get_float_seq () { const CORBA::FloatSeq *owned = TAO::DynAnyBasicTypeUtils<CORBA::FloatSeq>::get_value (this); @@ -1096,7 +1095,7 @@ TAO_DynCommon::get_float_seq (void) } CORBA::DoubleSeq * -TAO_DynCommon::get_double_seq (void) +TAO_DynCommon::get_double_seq () { const CORBA::DoubleSeq *owned = TAO::DynAnyBasicTypeUtils<CORBA::DoubleSeq>::get_value (this); @@ -1104,7 +1103,7 @@ TAO_DynCommon::get_double_seq (void) } CORBA::LongLongSeq * -TAO_DynCommon::get_longlong_seq (void) +TAO_DynCommon::get_longlong_seq () { const CORBA::LongLongSeq *owned = TAO::DynAnyBasicTypeUtils<CORBA::LongLongSeq>::get_value (this); @@ -1112,7 +1111,7 @@ TAO_DynCommon::get_longlong_seq (void) } CORBA::ULongLongSeq * -TAO_DynCommon::get_ulonglong_seq (void) +TAO_DynCommon::get_ulonglong_seq () { const CORBA::ULongLongSeq *owned = TAO::DynAnyBasicTypeUtils<CORBA::ULongLongSeq>::get_value (this); @@ -1120,7 +1119,7 @@ TAO_DynCommon::get_ulonglong_seq (void) } CORBA::LongDoubleSeq * -TAO_DynCommon::get_longdouble_seq (void) +TAO_DynCommon::get_longdouble_seq () { const CORBA::LongDoubleSeq *owned = TAO::DynAnyBasicTypeUtils<CORBA::LongDoubleSeq>::get_value (this); @@ -1128,7 +1127,7 @@ TAO_DynCommon::get_longdouble_seq (void) } CORBA::WCharSeq * -TAO_DynCommon::get_wchar_seq (void) +TAO_DynCommon::get_wchar_seq () { const CORBA::WCharSeq *owned = TAO::DynAnyBasicTypeUtils<CORBA::WCharSeq>::get_value (this); @@ -1269,19 +1268,19 @@ TAO_DynCommon::is_basic_type_seq (CORBA::TypeCode_ptr tc) } CORBA::Boolean -TAO_DynCommon::has_components (void) const +TAO_DynCommon::has_components () const { return this->has_components_; } CORBA::Boolean -TAO_DynCommon::destroyed (void) const +TAO_DynCommon::destroyed () const { return this->destroyed_; } CORBA::Any & -TAO_DynCommon::the_any (void) +TAO_DynCommon::the_any () { return this->any_; } diff --git a/TAO/tao/DynamicAny/DynCommon.h b/TAO/tao/DynamicAny/DynCommon.h index 4d8da9d2790..0d11430f27c 100644 --- a/TAO/tao/DynamicAny/DynCommon.h +++ b/TAO/tao/DynamicAny/DynCommon.h @@ -35,11 +35,11 @@ public: TAO_DynCommon (CORBA::Boolean allow_truncation); /// Destructor. - virtual ~TAO_DynCommon (void); + virtual ~TAO_DynCommon (); // = Some functions common to all Dynamic Any types. - virtual CORBA::TypeCode_ptr type (void); + virtual CORBA::TypeCode_ptr type (); virtual void assign (DynamicAny::DynAny_ptr dyn_any); @@ -81,59 +81,59 @@ public: virtual void insert_val (CORBA::ValueBase * value); - virtual CORBA::Boolean get_boolean (void); + virtual CORBA::Boolean get_boolean (); - virtual CORBA::Octet get_octet (void); + virtual CORBA::Octet get_octet (); - virtual CORBA::Char get_char (void); + virtual CORBA::Char get_char (); - virtual CORBA::Short get_short (void); + virtual CORBA::Short get_short (); - virtual CORBA::UShort get_ushort (void); + virtual CORBA::UShort get_ushort (); - virtual CORBA::Long get_long (void); + virtual CORBA::Long get_long (); - virtual CORBA::ULong get_ulong (void); + virtual CORBA::ULong get_ulong (); - virtual CORBA::Float get_float (void); + virtual CORBA::Float get_float (); - virtual CORBA::Double get_double (void); + virtual CORBA::Double get_double (); - virtual char * get_string (void); + virtual char * get_string (); - virtual CORBA::Object_ptr get_reference (void); + virtual CORBA::Object_ptr get_reference (); - virtual CORBA::TypeCode_ptr get_typecode (void); + virtual CORBA::TypeCode_ptr get_typecode (); - virtual CORBA::LongLong get_longlong (void); + virtual CORBA::LongLong get_longlong (); - virtual CORBA::ULongLong get_ulonglong (void); + virtual CORBA::ULongLong get_ulonglong (); - virtual CORBA::LongDouble get_longdouble (void); + virtual CORBA::LongDouble get_longdouble (); - virtual CORBA::WChar get_wchar (void); + virtual CORBA::WChar get_wchar (); - virtual CORBA::WChar * get_wstring (void); + virtual CORBA::WChar * get_wstring (); - virtual CORBA::Any * get_any (void); + virtual CORBA::Any * get_any (); - virtual DynamicAny::DynAny_ptr get_dyn_any (void); + virtual DynamicAny::DynAny_ptr get_dyn_any (); - virtual CORBA::ValueBase * get_val (void); + virtual CORBA::ValueBase * get_val (); virtual CORBA::Boolean seek (CORBA::Long index); - virtual void rewind (void); + virtual void rewind (); - virtual CORBA::Boolean next (void); + virtual CORBA::Boolean next (); - virtual DynamicAny::DynAny_ptr copy (void); + virtual DynamicAny::DynAny_ptr copy (); - virtual CORBA::ULong component_count (void); + virtual CORBA::ULong component_count (); virtual void insert_abstract (CORBA::AbstractBase_ptr value); - virtual CORBA::AbstractBase_ptr get_abstract (void); + virtual CORBA::AbstractBase_ptr get_abstract (); virtual void insert_boolean_seq (const CORBA::BooleanSeq & value); @@ -161,31 +161,31 @@ public: virtual void insert_wchar_seq (const CORBA::WCharSeq & value); - virtual CORBA::BooleanSeq * get_boolean_seq (void); + virtual CORBA::BooleanSeq * get_boolean_seq (); - virtual CORBA::OctetSeq * get_octet_seq (void); + virtual CORBA::OctetSeq * get_octet_seq (); - virtual CORBA::CharSeq * get_char_seq (void); + virtual CORBA::CharSeq * get_char_seq (); - virtual CORBA::ShortSeq * get_short_seq (void); + virtual CORBA::ShortSeq * get_short_seq (); - virtual CORBA::UShortSeq * get_ushort_seq (void); + virtual CORBA::UShortSeq * get_ushort_seq (); - virtual CORBA::LongSeq * get_long_seq (void); + virtual CORBA::LongSeq * get_long_seq (); - virtual CORBA::ULongSeq * get_ulong_seq (void); + virtual CORBA::ULongSeq * get_ulong_seq (); - virtual CORBA::FloatSeq * get_float_seq (void); + virtual CORBA::FloatSeq * get_float_seq (); - virtual CORBA::DoubleSeq * get_double_seq (void); + virtual CORBA::DoubleSeq * get_double_seq (); - virtual CORBA::LongLongSeq * get_longlong_seq (void); + virtual CORBA::LongLongSeq * get_longlong_seq (); - virtual CORBA::ULongLongSeq * get_ulonglong_seq (void); + virtual CORBA::ULongLongSeq * get_ulonglong_seq (); - virtual CORBA::LongDoubleSeq * get_longdouble_seq (void); + virtual CORBA::LongDoubleSeq * get_longdouble_seq (); - virtual CORBA::WCharSeq * get_wchar_seq (void); + virtual CORBA::WCharSeq * get_wchar_seq (); /// This sets one of two flags in this base class. CORBA 2.4.2 /// requires that destroy() do nothing if it is called on @@ -208,9 +208,9 @@ public: // Accessors - CORBA::Boolean has_components (void) const; - CORBA::Boolean destroyed (void) const; - CORBA::Any &the_any (void); + CORBA::Boolean has_components () const; + CORBA::Boolean destroyed () const; + CORBA::Any &the_any (); // Mutators diff --git a/TAO/tao/DynamicAny/DynEnum_i.cpp b/TAO/tao/DynamicAny/DynEnum_i.cpp index bb5529b24b6..7f25e22f02d 100644 --- a/TAO/tao/DynamicAny/DynEnum_i.cpp +++ b/TAO/tao/DynamicAny/DynEnum_i.cpp @@ -16,12 +16,12 @@ TAO_DynEnum_i::TAO_DynEnum_i (CORBA::Boolean allow_truncation) { } -TAO_DynEnum_i::~TAO_DynEnum_i (void) +TAO_DynEnum_i::~TAO_DynEnum_i () { } void -TAO_DynEnum_i::init_common (void) +TAO_DynEnum_i::init_common () { this->ref_to_component_ = false; this->container_is_destroying_ = false; @@ -103,7 +103,7 @@ TAO_DynEnum_i::_narrow (CORBA::Object_ptr _tao_objref) // **************************************************************** char * -TAO_DynEnum_i::get_as_string (void) +TAO_DynEnum_i::get_as_string () { CORBA::TypeCode_var ct = TAO_DynAnyFactory::strip_alias (this->type_.in ()); @@ -143,7 +143,7 @@ TAO_DynEnum_i::set_as_string (const char *value_as_string) } CORBA::ULong -TAO_DynEnum_i::get_as_ulong (void) +TAO_DynEnum_i::get_as_ulong () { return this->value_; } @@ -205,7 +205,7 @@ TAO_DynEnum_i::from_any (const CORBA::Any& any) } CORBA::Any_ptr -TAO_DynEnum_i::to_any (void) +TAO_DynEnum_i::to_any () { TAO_OutputCDR out_cdr; @@ -269,7 +269,7 @@ TAO_DynEnum_i::equal (DynamicAny::DynAny_ptr rhs) } void -TAO_DynEnum_i::destroy (void) +TAO_DynEnum_i::destroy () { if (this->destroyed_) { @@ -283,7 +283,7 @@ TAO_DynEnum_i::destroy (void) } DynamicAny::DynAny_ptr -TAO_DynEnum_i::current_component (void) +TAO_DynEnum_i::current_component () { if (this->destroyed_) { diff --git a/TAO/tao/DynamicAny/DynEnum_i.h b/TAO/tao/DynamicAny/DynEnum_i.h index 471cd24ce6d..6d05d6d7fae 100644 --- a/TAO/tao/DynamicAny/DynEnum_i.h +++ b/TAO/tao/DynamicAny/DynEnum_i.h @@ -45,7 +45,7 @@ public: TAO_DynEnum_i (CORBA::Boolean allow_truncation=true); /// Destructor. - ~TAO_DynEnum_i (void); + ~TAO_DynEnum_i (); /// Initialize using just a TypeCode. void init (CORBA::TypeCode_ptr tc); @@ -58,11 +58,11 @@ public: // = Functions specific to DynEnum. - virtual char * get_as_string (void); + virtual char * get_as_string (); virtual void set_as_string (const char * value); - virtual CORBA::ULong get_as_ulong (void); + virtual CORBA::ULong get_as_ulong (); virtual void set_as_ulong (CORBA::ULong value); @@ -70,17 +70,17 @@ public: virtual void from_any (const CORBA::Any & value); - virtual CORBA::Any * to_any (void); + virtual CORBA::Any * to_any (); virtual CORBA::Boolean equal (DynamicAny::DynAny_ptr dyn_any); - virtual void destroy (void); + virtual void destroy (); - virtual DynamicAny::DynAny_ptr current_component (void); + virtual DynamicAny::DynAny_ptr current_component (); private: // Called by both versions of init(). - void init_common (void); + void init_common (); // = Use copy() or assign() instead of these. TAO_DynEnum_i (const TAO_DynEnum_i &src); diff --git a/TAO/tao/DynamicAny/DynSequence_i.cpp b/TAO/tao/DynamicAny/DynSequence_i.cpp index 702fb10a131..749a3b79e93 100644 --- a/TAO/tao/DynamicAny/DynSequence_i.cpp +++ b/TAO/tao/DynamicAny/DynSequence_i.cpp @@ -16,12 +16,12 @@ TAO_DynSequence_i::TAO_DynSequence_i (CORBA::Boolean allow_truncation) { } -TAO_DynSequence_i::~TAO_DynSequence_i (void) +TAO_DynSequence_i::~TAO_DynSequence_i () { } void -TAO_DynSequence_i::init_common (void) +TAO_DynSequence_i::init_common () { this->ref_to_component_ = false; this->container_is_destroying_ = false; @@ -137,7 +137,7 @@ TAO_DynSequence_i::_narrow (CORBA::Object_ptr _tao_objref) // **************************************************************** CORBA::TypeCode_ptr -TAO_DynSequence_i::get_element_type (void) +TAO_DynSequence_i::get_element_type () { CORBA::TypeCode_var element_type = CORBA::TypeCode::_duplicate (this->type_.in ()); @@ -161,7 +161,7 @@ TAO_DynSequence_i::get_element_type (void) // = Functions specific to DynSequence. CORBA::ULong -TAO_DynSequence_i::get_length (void) +TAO_DynSequence_i::get_length () { if (this->destroyed_) { @@ -247,7 +247,7 @@ TAO_DynSequence_i::set_length (CORBA::ULong length) } DynamicAny::AnySeq * -TAO_DynSequence_i::get_elements (void) +TAO_DynSequence_i::get_elements () { if (this->destroyed_) { @@ -360,7 +360,7 @@ TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value) } DynamicAny::DynAnySeq * -TAO_DynSequence_i::get_elements_as_dyn_any (void) +TAO_DynSequence_i::get_elements_as_dyn_any () { if (this->destroyed_) { @@ -562,7 +562,7 @@ TAO_DynSequence_i::from_any (const CORBA::Any & any) } CORBA::Any_ptr -TAO_DynSequence_i::to_any (void) +TAO_DynSequence_i::to_any () { if (this->destroyed_) { @@ -668,7 +668,7 @@ TAO_DynSequence_i::equal (DynamicAny::DynAny_ptr rhs) } void -TAO_DynSequence_i::destroy (void) +TAO_DynSequence_i::destroy () { if (this->destroyed_) { @@ -690,7 +690,7 @@ TAO_DynSequence_i::destroy (void) } DynamicAny::DynAny_ptr -TAO_DynSequence_i::current_component (void) +TAO_DynSequence_i::current_component () { if (this->destroyed_) { diff --git a/TAO/tao/DynamicAny/DynSequence_i.h b/TAO/tao/DynamicAny/DynSequence_i.h index f76bc51aa9d..276a39f7022 100644 --- a/TAO/tao/DynamicAny/DynSequence_i.h +++ b/TAO/tao/DynamicAny/DynSequence_i.h @@ -44,7 +44,7 @@ public: TAO_DynSequence_i (CORBA::Boolean allow_truncation=true); /// Destructor. - ~TAO_DynSequence_i (void); + ~TAO_DynSequence_i (); /// Initialize using just a TypeCode. void init (CORBA::TypeCode_ptr tc); @@ -57,15 +57,15 @@ public: // = Functions specific to DynSequence. - virtual CORBA::ULong get_length (void); + virtual CORBA::ULong get_length (); virtual void set_length (CORBA::ULong len); - virtual DynamicAny::AnySeq * get_elements (void); + virtual DynamicAny::AnySeq * get_elements (); virtual void set_elements (const DynamicAny::AnySeq & value); - virtual DynamicAny::DynAnySeq * get_elements_as_dyn_any (void); + virtual DynamicAny::DynAnySeq * get_elements_as_dyn_any (); virtual void set_elements_as_dyn_any (const DynamicAny::DynAnySeq & value); @@ -74,20 +74,20 @@ public: virtual void from_any (const CORBA::Any & value); - virtual CORBA::Any * to_any (void); + virtual CORBA::Any * to_any (); virtual CORBA::Boolean equal (DynamicAny::DynAny_ptr dyn_any); - virtual void destroy (void); + virtual void destroy (); - virtual DynamicAny::DynAny_ptr current_component (void); + virtual DynamicAny::DynAny_ptr current_component (); private: // Utility, turns the type of elements contained in the sequence. - CORBA::TypeCode_ptr get_element_type (void); + CORBA::TypeCode_ptr get_element_type (); // Called by both versions of init(). - void init_common (void); + void init_common (); // = Use copy() or assign() instead of these TAO_DynSequence_i (const TAO_DynSequence_i &src); diff --git a/TAO/tao/DynamicAny/DynStruct_i.cpp b/TAO/tao/DynamicAny/DynStruct_i.cpp index bd366d20ad2..bfa40f2874e 100644 --- a/TAO/tao/DynamicAny/DynStruct_i.cpp +++ b/TAO/tao/DynamicAny/DynStruct_i.cpp @@ -16,7 +16,7 @@ TAO_DynStruct_i::TAO_DynStruct_i (CORBA::Boolean allow_truncation) { } -TAO_DynStruct_i::~TAO_DynStruct_i (void) +TAO_DynStruct_i::~TAO_DynStruct_i () { } @@ -34,7 +34,7 @@ TAO_DynStruct_i::check_typecode (CORBA::TypeCode_ptr tc) } void -TAO_DynStruct_i::init_common (void) +TAO_DynStruct_i::init_common () { this->ref_to_component_ = false; this->container_is_destroying_ = false; @@ -179,7 +179,7 @@ TAO_DynStruct_i::_narrow (CORBA::Object_ptr _tao_objref) // **************************************************************** DynamicAny::FieldName -TAO_DynStruct_i::current_member_name (void) +TAO_DynStruct_i::current_member_name () { if (this->destroyed_) { @@ -208,7 +208,7 @@ TAO_DynStruct_i::current_member_name (void) // Returns the unaliased TCKind. CORBA::TCKind -TAO_DynStruct_i::current_member_kind (void) +TAO_DynStruct_i::current_member_kind () { if (this->destroyed_) { @@ -238,7 +238,7 @@ TAO_DynStruct_i::current_member_kind (void) } DynamicAny::NameValuePairSeq * -TAO_DynStruct_i::get_members (void) +TAO_DynStruct_i::get_members () { if (this->destroyed_) { @@ -305,8 +305,7 @@ TAO_DynStruct_i::set_members (const DynamicAny::NameValuePairSeq & values) // member_type() does not work with aliased type codes. CORBA::TypeCode_var unaliased_tc = - TAO_DynAnyFactory::strip_alias (this->type_.in () - ); + TAO_DynAnyFactory::strip_alias (this->type_.in ()); for (CORBA::ULong i = 0; i < length; ++i) { @@ -335,7 +334,7 @@ TAO_DynStruct_i::set_members (const DynamicAny::NameValuePairSeq & values) } DynamicAny::NameDynAnyPairSeq * -TAO_DynStruct_i::get_members_as_dyn_any (void) +TAO_DynStruct_i::get_members_as_dyn_any () { if (this->destroyed_) { @@ -397,8 +396,7 @@ TAO_DynStruct_i::set_members_as_dyn_any ( // member_type() does not work with aliased type codes. CORBA::TypeCode_var unaliased_tc = - TAO_DynAnyFactory::strip_alias (this->type_.in () - ); + TAO_DynAnyFactory::strip_alias (this->type_.in ()); for (CORBA::ULong i = 0; i < length; ++i) { @@ -435,8 +433,7 @@ TAO_DynStruct_i::from_any (const CORBA::Any & any) CORBA::TypeCode_var tc = any.type (); CORBA::Boolean equivalent = - this->type_->equivalent (tc.in () - ); + this->type_->equivalent (tc.in ()); if (equivalent) { @@ -474,8 +471,7 @@ TAO_DynStruct_i::from_any (const CORBA::Any & any) CORBA::TypeCode_var field_tc; CORBA::TypeCode_var unaliased = - TAO::unaliased_typecode (this->type_.in () - ); + TAO::unaliased_typecode (this->type_.in ()); for (CORBA::ULong i = 0; i < this->component_count_; ++i) { @@ -510,7 +506,7 @@ TAO_DynStruct_i::from_any (const CORBA::Any & any) } CORBA::Any_ptr -TAO_DynStruct_i::to_any (void) +TAO_DynStruct_i::to_any () { if (this->destroyed_) { @@ -619,7 +615,7 @@ TAO_DynStruct_i::equal (DynamicAny::DynAny_ptr rhs) } void -TAO_DynStruct_i::destroy (void) +TAO_DynStruct_i::destroy () { if (this->destroyed_) { @@ -641,7 +637,7 @@ TAO_DynStruct_i::destroy (void) } DynamicAny::DynAny_ptr -TAO_DynStruct_i::current_component (void) +TAO_DynStruct_i::current_component () { if (this->destroyed_) { diff --git a/TAO/tao/DynamicAny/DynStruct_i.h b/TAO/tao/DynamicAny/DynStruct_i.h index f390cda7a22..ba993d6c84c 100644 --- a/TAO/tao/DynamicAny/DynStruct_i.h +++ b/TAO/tao/DynamicAny/DynStruct_i.h @@ -44,7 +44,7 @@ public: TAO_DynStruct_i (CORBA::Boolean allow_truncation=true); /// Destructor. - ~TAO_DynStruct_i (void); + ~TAO_DynStruct_i (); /// Initialize using just a TypeCode. void init (CORBA::TypeCode_ptr tc); @@ -57,15 +57,15 @@ public: // = Functions specific to DynStruct. - virtual DynamicAny::FieldName current_member_name (void); + virtual DynamicAny::FieldName current_member_name (); - virtual CORBA::TCKind current_member_kind (void); + virtual CORBA::TCKind current_member_kind (); - virtual DynamicAny::NameValuePairSeq *get_members (void); + virtual DynamicAny::NameValuePairSeq *get_members (); virtual void set_members (const DynamicAny::NameValuePairSeq& value); - virtual DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any (void); + virtual DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any (); virtual void set_members_as_dyn_any ( const DynamicAny::NameDynAnyPairSeq & value); @@ -74,13 +74,13 @@ public: virtual void from_any (const CORBA::Any & value); - virtual CORBA::Any * to_any (void); + virtual CORBA::Any * to_any (); virtual CORBA::Boolean equal (DynamicAny::DynAny_ptr dyn_any); - virtual void destroy (void); + virtual void destroy (); - virtual DynamicAny::DynAny_ptr current_component (void); + virtual DynamicAny::DynAny_ptr current_component (); private: /// Check if the typecode is acceptable. @@ -91,7 +91,7 @@ private: void set_from_any (const CORBA::Any &any); /// Called by both versions of init(). - void init_common (void); + void init_common (); // = Use copy() or assign() instead of these. TAO_DynStruct_i (const TAO_DynStruct_i &src); diff --git a/TAO/tao/DynamicAny/DynUnion_i.cpp b/TAO/tao/DynamicAny/DynUnion_i.cpp index 92007447d85..bba6b5e1a72 100644 --- a/TAO/tao/DynamicAny/DynUnion_i.cpp +++ b/TAO/tao/DynamicAny/DynUnion_i.cpp @@ -18,12 +18,12 @@ TAO_DynUnion_i::TAO_DynUnion_i (CORBA::Boolean allow_truncation) { } -TAO_DynUnion_i::~TAO_DynUnion_i (void) +TAO_DynUnion_i::~TAO_DynUnion_i () { } void -TAO_DynUnion_i::init_common (void) +TAO_DynUnion_i::init_common () { this->ref_to_component_ = false; this->container_is_destroying_ = false; @@ -108,8 +108,7 @@ TAO_DynUnion_i::init (CORBA::TypeCode_ptr tc) } CORBA::TypeCode_var first_type = - unaliased_tc->member_type (this->current_position_ - ); + unaliased_tc->member_type (this->current_position_); // Recursively initialize the member to its default value. this->member_ = @@ -261,8 +260,7 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any) CORBA::ULong index = static_cast<CORBA::ULong> (default_index); CORBA::TypeCode_var default_tc = - tc->member_type (index - ); + tc->member_type (index); CORBA::Any default_any; TAO::Unknown_IDL_Type *unk = 0; @@ -285,7 +283,7 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any) // **************************************************************** DynamicAny::DynAny_ptr -TAO_DynUnion_i::get_discriminator (void) +TAO_DynUnion_i::get_discriminator () { if (this->destroyed_) { @@ -427,7 +425,7 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value) } void -TAO_DynUnion_i::set_to_default_member (void) +TAO_DynUnion_i::set_to_default_member () { if (this->destroyed_) { @@ -470,7 +468,7 @@ TAO_DynUnion_i::set_to_default_member (void) } void -TAO_DynUnion_i::set_to_no_active_member (void) +TAO_DynUnion_i::set_to_no_active_member () { if (this->destroyed_) { @@ -519,7 +517,7 @@ TAO_DynUnion_i::set_to_no_active_member (void) } CORBA::Boolean -TAO_DynUnion_i::has_no_active_member (void) +TAO_DynUnion_i::has_no_active_member () { if (this->destroyed_) { @@ -531,7 +529,7 @@ TAO_DynUnion_i::has_no_active_member (void) } CORBA::TCKind -TAO_DynUnion_i::discriminator_kind (void) +TAO_DynUnion_i::discriminator_kind () { if (this->destroyed_) { @@ -545,7 +543,7 @@ TAO_DynUnion_i::discriminator_kind (void) } DynamicAny::DynAny_ptr -TAO_DynUnion_i::member (void) +TAO_DynUnion_i::member () { if (this->destroyed_) { @@ -562,15 +560,13 @@ TAO_DynUnion_i::member (void) // A deep copy is made only by copy() (CORBA 2.4.2 section 9.2.3.6). // Set the flag so the caller can't destroy. - this->set_flag (this->member_.in (), - 0 - ); + this->set_flag (this->member_.in (), 0); return DynamicAny::DynAny::_duplicate (this->member_.in ()); } char * -TAO_DynUnion_i::member_name (void) +TAO_DynUnion_i::member_name () { if (this->destroyed_) { @@ -591,7 +587,7 @@ TAO_DynUnion_i::member_name (void) } CORBA::TCKind -TAO_DynUnion_i::member_kind (void) +TAO_DynUnion_i::member_kind () { if (this->destroyed_) { @@ -635,8 +631,7 @@ TAO_DynUnion_i::from_any (const CORBA::Any& any) // Set the from_factory arg to FALSE, so any problems will throw // TypeMismatch. - this->set_from_any (any - ); + this->set_from_any (any); } else { @@ -645,7 +640,7 @@ TAO_DynUnion_i::from_any (const CORBA::Any& any) } CORBA::Any_ptr -TAO_DynUnion_i::to_any (void) +TAO_DynUnion_i::to_any () { if (this->destroyed_) { @@ -775,7 +770,7 @@ TAO_DynUnion_i::equal (DynamicAny::DynAny_ptr rhs) } void -TAO_DynUnion_i::destroy (void) +TAO_DynUnion_i::destroy () { if (this->destroyed_) { @@ -802,7 +797,7 @@ TAO_DynUnion_i::destroy (void) } DynamicAny::DynAny_ptr -TAO_DynUnion_i::current_component (void) +TAO_DynUnion_i::current_component () { if (this->destroyed_) { diff --git a/TAO/tao/DynamicAny/DynUnion_i.h b/TAO/tao/DynamicAny/DynUnion_i.h index e12129861e0..27436f421af 100644 --- a/TAO/tao/DynamicAny/DynUnion_i.h +++ b/TAO/tao/DynamicAny/DynUnion_i.h @@ -43,7 +43,7 @@ public: TAO_DynUnion_i (CORBA::Boolean allow_truncation=true); /// Destructor. - ~TAO_DynUnion_i (void); + ~TAO_DynUnion_i (); /// Constructor taking an Any argument. void init (const CORBA::Any& any); @@ -56,35 +56,35 @@ public: // = Functions specific to DynUnion. - virtual DynamicAny::DynAny_ptr get_discriminator (void); + virtual DynamicAny::DynAny_ptr get_discriminator (); virtual void set_discriminator (DynamicAny::DynAny_ptr d); - virtual void set_to_default_member (void); + virtual void set_to_default_member (); - virtual void set_to_no_active_member (void); + virtual void set_to_no_active_member (); - virtual CORBA::Boolean has_no_active_member (void); + virtual CORBA::Boolean has_no_active_member (); - virtual CORBA::TCKind discriminator_kind (void); + virtual CORBA::TCKind discriminator_kind (); - virtual DynamicAny::DynAny_ptr member (void); + virtual DynamicAny::DynAny_ptr member (); - virtual char * member_name (void); + virtual char * member_name (); - virtual CORBA::TCKind member_kind (void); + virtual CORBA::TCKind member_kind (); // = DynAny common functions not implemented in class TAO_DynCommon. virtual void from_any (const CORBA::Any & value); - virtual CORBA::Any * to_any (void); + virtual CORBA::Any * to_any (); virtual CORBA::Boolean equal (DynamicAny::DynAny_ptr dyn_any); - virtual void destroy (void); + virtual void destroy (); - virtual DynamicAny::DynAny_ptr current_component (void); + virtual DynamicAny::DynAny_ptr current_component (); private: /// Code common to the constructor from an Any arg and the member @@ -92,7 +92,7 @@ private: void set_from_any (const CORBA::Any &any); /// Called by both versions of init(). - void init_common (void); + void init_common (); /// Iterative check for label value match. CORBA::Boolean label_match (const CORBA::Any &my_any, diff --git a/TAO/tao/DynamicAny/DynValueBox_i.cpp b/TAO/tao/DynamicAny/DynValueBox_i.cpp index 4f6976e784e..4b522011808 100644 --- a/TAO/tao/DynamicAny/DynValueBox_i.cpp +++ b/TAO/tao/DynamicAny/DynValueBox_i.cpp @@ -18,12 +18,12 @@ TAO_DynValueBox_i::TAO_DynValueBox_i (CORBA::Boolean allow_truncation) { } -TAO_DynValueBox_i::~TAO_DynValueBox_i (void) +TAO_DynValueBox_i::~TAO_DynValueBox_i () { } void -TAO_DynValueBox_i::set_to_value (void) +TAO_DynValueBox_i::set_to_value () { if (CORBA::is_nil (this->boxed_.in ())) { @@ -87,7 +87,7 @@ TAO_DynValueBox_i::_narrow (CORBA::Object_ptr _tao_objref) } CORBA::Any * -TAO_DynValueBox_i::get_boxed_value (void) +TAO_DynValueBox_i::get_boxed_value () { if (this->destroyed_) { @@ -127,7 +127,7 @@ TAO_DynValueBox_i::set_boxed_value (const CORBA::Any & boxed) } DynamicAny::DynAny_ptr -TAO_DynValueBox_i::get_boxed_value_as_dyn_any (void) +TAO_DynValueBox_i::get_boxed_value_as_dyn_any () { if (this->destroyed_) { @@ -216,7 +216,7 @@ TAO_DynValueBox_i::equal (DynamicAny::DynAny_ptr rhs) } void -TAO_DynValueBox_i::destroy (void) +TAO_DynValueBox_i::destroy () { if (this->destroyed_) { @@ -237,7 +237,7 @@ TAO_DynValueBox_i::destroy (void) } DynamicAny::DynAny_ptr -TAO_DynValueBox_i::current_component (void) +TAO_DynValueBox_i::current_component () { if (this->destroyed_) { @@ -324,7 +324,7 @@ TAO_DynValueBox_i::set_from_any (const CORBA::Any & any) } CORBA::Any_ptr -TAO_DynValueBox_i::to_any (void) +TAO_DynValueBox_i::to_any () { if (this->destroyed_) { @@ -336,7 +336,7 @@ TAO_DynValueBox_i::to_any (void) // Is this an NULL Valuetype? if (!CORBA::ValueBase::_tao_write_special_value ( out_cdr, reinterpret_cast <CORBA::ValueBase *> ( - this->is_null_ ? 0 : this ) )) + this->is_null_ ? 0 : this))) { // Build <value-tag>, which states if chunking is used // and if type information ((list of) repository id(s)) diff --git a/TAO/tao/DynamicAny/DynValueBox_i.h b/TAO/tao/DynamicAny/DynValueBox_i.h index 992fa8aedb4..3dadf64cb6c 100644 --- a/TAO/tao/DynamicAny/DynValueBox_i.h +++ b/TAO/tao/DynamicAny/DynValueBox_i.h @@ -39,7 +39,7 @@ public: TAO_DynValueBox_i (CORBA::Boolean allow_truncation=true); /// Destructor. - ~TAO_DynValueBox_i (void); + ~TAO_DynValueBox_i (); /// Initialize using just a TypeCode. void init (CORBA::TypeCode_ptr tc); @@ -51,27 +51,27 @@ public: static TAO_DynValueBox_i *_narrow (CORBA::Object_ptr obj); // = Functions specific to DynValueBox. - virtual CORBA::Any * get_boxed_value (void); + virtual CORBA::Any * get_boxed_value (); virtual void set_boxed_value (const CORBA::Any & boxed); - virtual DynamicAny::DynAny_ptr get_boxed_value_as_dyn_any (void); + virtual DynamicAny::DynAny_ptr get_boxed_value_as_dyn_any (); virtual void set_boxed_value_as_dyn_any (DynamicAny::DynAny_ptr boxed); // = DynAny common functions not implemented in class TAO_DynCommon. virtual void from_any (const CORBA::Any & value); - virtual CORBA::Any * to_any (void); + virtual CORBA::Any * to_any (); virtual CORBA::Boolean equal (DynamicAny::DynAny_ptr dyn_any); - virtual void destroy (void); + virtual void destroy (); - virtual DynamicAny::DynAny_ptr current_component (void); + virtual DynamicAny::DynAny_ptr current_component (); // = DynValueCommon needed to be provided here - virtual void set_to_value (void); + virtual void set_to_value (); private: /// Check if the typecode is acceptable. diff --git a/TAO/tao/DynamicAny/DynValueCommon_i.cpp b/TAO/tao/DynamicAny/DynValueCommon_i.cpp index 08400a45e9a..7a105953409 100644 --- a/TAO/tao/DynamicAny/DynValueCommon_i.cpp +++ b/TAO/tao/DynamicAny/DynValueCommon_i.cpp @@ -11,18 +11,18 @@ TAO_DynValueCommon_i::TAO_DynValueCommon_i (CORBA::Boolean allow_truncation) { } -TAO_DynValueCommon_i::~TAO_DynValueCommon_i (void) +TAO_DynValueCommon_i::~TAO_DynValueCommon_i () { } CORBA::Boolean -TAO_DynValueCommon_i::is_null (void) +TAO_DynValueCommon_i::is_null () { return this->is_null_; } void -TAO_DynValueCommon_i::set_to_null (void) +TAO_DynValueCommon_i::set_to_null () { this->is_null_ = true; this->component_count_ = 0u; @@ -30,7 +30,7 @@ TAO_DynValueCommon_i::set_to_null (void) } void -TAO_DynValueCommon_i::init_common (void) +TAO_DynValueCommon_i::init_common () { this->ref_to_component_ = false; this->container_is_destroying_ = false; diff --git a/TAO/tao/DynamicAny/DynValueCommon_i.h b/TAO/tao/DynamicAny/DynValueCommon_i.h index 30cc907773d..7dbf099ecbf 100644 --- a/TAO/tao/DynamicAny/DynValueCommon_i.h +++ b/TAO/tao/DynamicAny/DynValueCommon_i.h @@ -39,20 +39,20 @@ public: TAO_DynValueCommon_i (CORBA::Boolean allow_truncation=true); /// Destructor. - ~TAO_DynValueCommon_i (void); + ~TAO_DynValueCommon_i (); // = LocalObject methods. static TAO_DynValueCommon_i *_narrow (CORBA::Object_ptr obj); /// Called by DynValue and DynValueBox init() functions. - void init_common (void); + void init_common (); // = Functions specific to DynValueCommon. - virtual CORBA::Boolean is_null (void); + virtual CORBA::Boolean is_null (); - virtual void set_to_null (void); + virtual void set_to_null (); - virtual void set_to_value (void) = 0; + virtual void set_to_value () = 0; private: // = Use copy() or assign() instead of these. diff --git a/TAO/tao/DynamicAny/DynValue_i.cpp b/TAO/tao/DynamicAny/DynValue_i.cpp index 7a58d303fb3..728b5614b1a 100644 --- a/TAO/tao/DynamicAny/DynValue_i.cpp +++ b/TAO/tao/DynamicAny/DynValue_i.cpp @@ -21,7 +21,7 @@ TAO_DynValue_i::TAO_DynValue_i (CORBA::Boolean allow_truncation) { } -TAO_DynValue_i::~TAO_DynValue_i (void) +TAO_DynValue_i::~TAO_DynValue_i () { } @@ -205,7 +205,7 @@ TAO_DynValue_i::get_member_name ( } void -TAO_DynValue_i::set_to_value (void) +TAO_DynValue_i::set_to_value () { this->component_count_ = static_cast <CORBA::ULong> (this->da_members_.size ()); @@ -234,7 +234,7 @@ TAO_DynValue_i::_narrow (CORBA::Object_ptr _tao_objref) } DynamicAny::FieldName -TAO_DynValue_i::current_member_name (void) +TAO_DynValue_i::current_member_name () { if (this->destroyed_) { @@ -253,7 +253,7 @@ TAO_DynValue_i::current_member_name (void) } CORBA::TCKind -TAO_DynValue_i::current_member_kind (void) +TAO_DynValue_i::current_member_kind () { if (this->destroyed_) { @@ -273,7 +273,7 @@ TAO_DynValue_i::current_member_kind (void) } DynamicAny::NameValuePairSeq * -TAO_DynValue_i::get_members (void) +TAO_DynValue_i::get_members () { if (this->destroyed_) { @@ -351,7 +351,7 @@ TAO_DynValue_i::set_members ( } DynamicAny::NameDynAnyPairSeq * -TAO_DynValue_i::get_members_as_dyn_any (void) +TAO_DynValue_i::get_members_as_dyn_any () { if (this->destroyed_) { @@ -491,7 +491,7 @@ TAO_DynValue_i::equal (DynamicAny::DynAny_ptr rhs) } void -TAO_DynValue_i::destroy (void) +TAO_DynValue_i::destroy () { if (this->destroyed_) { @@ -519,7 +519,7 @@ TAO_DynValue_i::destroy (void) } DynamicAny::DynAny_ptr -TAO_DynValue_i::current_component (void) +TAO_DynValue_i::current_component () { if (this->destroyed_) { @@ -602,7 +602,7 @@ TAO_DynValue_i::insert_val (CORBA::ValueBase *value) // which then will be wrong type for the valuetype // output we want. CORBA::ValueBase * -TAO_DynValue_i::get_val (void) +TAO_DynValue_i::get_val () { if (this->destroyed_) { @@ -626,7 +626,7 @@ TAO_DynValue_i::get_val (void) } CORBA::Any_ptr -TAO_DynValue_i::to_any (void) +TAO_DynValue_i::to_any () { if (this->destroyed_) { @@ -704,7 +704,7 @@ TAO_DynValue_i::to_outputCDR (TAO_OutputCDR &out_cdr) if (!CORBA::ValueBase::_tao_write_special_value ( out_cdr, reinterpret_cast <CORBA::ValueBase *> - (this->is_null_ ? 0 : this) )) + (this->is_null_ ? 0 : this))) { // OK since a special_value hasn't been written we are // NOT a NULL or indirect ValueType. We need to create @@ -1201,7 +1201,7 @@ TAO_DynValue_i::from_inputCDR (TAO_InputCDR &strm) // base-type's state. if (!( (currentBase || !requires_truncation) ? ci.handle_chunking (strm) : - ci.skip_chunks (strm) )) + ci.skip_chunks (strm))) { TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - %N:%l TAO_DynValue_i::from_inputCDR() ") diff --git a/TAO/tao/DynamicAny/DynValue_i.h b/TAO/tao/DynamicAny/DynValue_i.h index ce0194f7211..f3f8884342e 100644 --- a/TAO/tao/DynamicAny/DynValue_i.h +++ b/TAO/tao/DynamicAny/DynValue_i.h @@ -39,7 +39,7 @@ public: TAO_DynValue_i (CORBA::Boolean allow_truncation=true); /// Destructor. - ~TAO_DynValue_i (void); + ~TAO_DynValue_i (); /// Initialize using an Any. void init (const CORBA::Any& any); @@ -54,15 +54,15 @@ public: static TAO_DynValue_i *_narrow (CORBA::Object_ptr obj); // = Functions specific to DynValue. - virtual DynamicAny::FieldName current_member_name (void); + virtual DynamicAny::FieldName current_member_name (); - virtual CORBA::TCKind current_member_kind (void); + virtual CORBA::TCKind current_member_kind (); - virtual DynamicAny::NameValuePairSeq * get_members (void); + virtual DynamicAny::NameValuePairSeq * get_members (); virtual void set_members (const DynamicAny::NameValuePairSeq & value); - virtual DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any (void); + virtual DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any (); virtual void set_members_as_dyn_any ( const DynamicAny::NameDynAnyPairSeq & value); @@ -70,20 +70,20 @@ public: // = DynAny common functions not implemented in class TAO_DynCommon. virtual void from_any (const CORBA::Any & value); - virtual CORBA::Any * to_any (void); + virtual CORBA::Any * to_any (); virtual CORBA::Boolean equal (DynamicAny::DynAny_ptr dyn_any); - virtual void destroy (void); + virtual void destroy (); - virtual DynamicAny::DynAny_ptr current_component (void); + virtual DynamicAny::DynAny_ptr current_component (); virtual void insert_val (CORBA::ValueBase * value); - virtual CORBA::ValueBase * get_val (void); + virtual CORBA::ValueBase * get_val (); // = DynValueCommon needed to be provided here - virtual void set_to_value (void); + virtual void set_to_value (); private: /// List of base types. diff --git a/TAO/tao/DynamicAny/DynamicAny.cpp b/TAO/tao/DynamicAny/DynamicAny.cpp index 1b6128a6254..ccb3723a2b5 100644 --- a/TAO/tao/DynamicAny/DynamicAny.cpp +++ b/TAO/tao/DynamicAny/DynamicAny.cpp @@ -12,7 +12,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_DynamicAny_Loader::TAO_DynamicAny_Loader (void) +TAO_DynamicAny_Loader::TAO_DynamicAny_Loader () { } @@ -29,7 +29,7 @@ TAO_DynamicAny_Loader::create_object (CORBA::ORB_ptr, } int -TAO_DynamicAny_Loader::Initializer (void) +TAO_DynamicAny_Loader::Initializer () { return ACE_Service_Config::process_directive (ace_svc_desc_TAO_DynamicAny_Loader); } diff --git a/TAO/tao/DynamicAny/DynamicAny.h b/TAO/tao/DynamicAny/DynamicAny.h index 6d8059ff461..6c64249fdca 100644 --- a/TAO/tao/DynamicAny/DynamicAny.h +++ b/TAO/tao/DynamicAny/DynamicAny.h @@ -32,7 +32,7 @@ class TAO_DynamicAny_Export TAO_DynamicAny_Loader : public TAO_Object_Loader { public: /// Constructor - TAO_DynamicAny_Loader (void); + TAO_DynamicAny_Loader (); /// Creates a DynamicAny factory and returns it. virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, @@ -40,7 +40,7 @@ public: ACE_TCHAR *argv []); /// Used to force the initialization of the ORB code. - static int Initializer (void); + static int Initializer (); }; static int diff --git a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp index 2b421eb3c91..52bf4e2517a 100644 --- a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp +++ b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp @@ -302,11 +302,7 @@ TAO_AMH_DSI_Exception_Holder::_tao_unmarshal ( void TAO_AMH_DSI_Exception_Holder::raise_invoke () { -#if defined (ACE_HAS_CPP11) std::unique_ptr< ::CORBA::Exception> safety (this->exception_); -#else - auto_ptr< ::CORBA::Exception> safety (this->exception_); -#endif /* ACE_HAS_CPP11 */ this->exception_->_raise (); } @@ -411,7 +407,7 @@ TAO_AMH_DSI_Response_Handler::gateway_exception_reply ( this->_tao_out.write_char_array (encap.buffer (), ACE_Utils::truncate_cast<ACE_CDR::ULong> (encap.length ())); // This will prevent the marshaling of any parameters into this reply. - // this->sent_gateway_exception_ = 1; + // this->sent_gateway_exception_ = true; this->_tao_rh_send_reply (); } catch (const CORBA::Exception &) @@ -456,7 +452,7 @@ TAO_AMH_DSI_Response_Handler::gateway_exception_reply ( // to the original source of the reply. this->_tao_out.write_octet_array_mb (encap.start()); // This will prevent the marshaling of any parameters into this reply. - // this->sent_gateway_exception_ = 1; + // this->sent_gateway_exception_ = true; this->_tao_rh_send_reply (); } catch (const CORBA::Exception &) @@ -484,7 +480,7 @@ TAO_AMH_DSI_Response_Handler::_unchecked_narrow (CORBA::Object_ptr obj) if (CORBA::is_nil (obj)) return TAO_AMH_DSI_Response_Handler::_nil (); - return dynamic_cast < TAO_AMH_DSI_Response_Handler_ptr > (obj); + return dynamic_cast <TAO_AMH_DSI_Response_Handler_ptr> (obj); } const char* diff --git a/TAO/tao/DynamicInterface/Context.h b/TAO/tao/DynamicInterface/Context.h index 4076983b754..dd9eb9cfc5a 100644 --- a/TAO/tao/DynamicInterface/Context.h +++ b/TAO/tao/DynamicInterface/Context.h @@ -31,11 +31,7 @@ #include "tao/default_environment.h" #include "ace/Unbounded_Queue.h" -#if defined (ACE_HAS_CPP11) -# include <atomic> -#else -# include "ace/Atomic_Op.h" -#endif /* ACE_HAS_CPP11 */ +#include <atomic> TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -113,11 +109,7 @@ namespace CORBA private: /// Reference counter. -#if defined (ACE_HAS_CPP11) std::atomic<uint32_t> refcount_; -#else - ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; -#endif /* ACE_HAS_CPP11 */ }; /** @@ -182,11 +174,7 @@ namespace CORBA ContextList &operator= (const ContextList &); /// Reference counter. -#if defined (ACE_HAS_CPP11) std::atomic<uint32_t> refcount_; -#else - ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; -#endif /* ACE_HAS_CPP11 */ /// Internal list of typecodes. ACE_Unbounded_Queue<char *> ctx_list_; diff --git a/TAO/tao/DynamicInterface/DII_Arguments.cpp b/TAO/tao/DynamicInterface/DII_Arguments.cpp index d95e1c7ab1b..7ca4ea488b9 100644 --- a/TAO/tao/DynamicInterface/DII_Arguments.cpp +++ b/TAO/tao/DynamicInterface/DII_Arguments.cpp @@ -59,7 +59,6 @@ namespace TAO CORBA::Boolean NVList_Argument::demarshal (TAO_InputCDR &cdr) { - try { // Now, get all the "return", "out", and "inout" parameters diff --git a/TAO/tao/DynamicInterface/ExceptionList.h b/TAO/tao/DynamicInterface/ExceptionList.h index db7200985ed..a59a7b059eb 100644 --- a/TAO/tao/DynamicInterface/ExceptionList.h +++ b/TAO/tao/DynamicInterface/ExceptionList.h @@ -30,11 +30,7 @@ #include "tao/Pseudo_VarOut_T.h" #include "ace/Unbounded_Queue.h" -#if defined (ACE_HAS_CPP11) -# include <atomic> -#else -# include "ace/Atomic_Op.h" -#endif /* ACE_HAS_CPP11 */ +#include <atomic> TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -106,11 +102,7 @@ namespace CORBA ExceptionList &operator= (const ExceptionList &); /// Reference counter. -#if defined (ACE_HAS_CPP11) std::atomic<uint32_t> refcount_; -#else - ACE_Atomic_Op<TAO_SYNCH_MUTEX, CORBA::ULong> refcount_; -#endif /* ACE_HAS_CPP11 */ /// Internal list of typecodes. ACE_Unbounded_Queue<CORBA::TypeCode_ptr> tc_list_; diff --git a/TAO/tao/DynamicInterface/Request.h b/TAO/tao/DynamicInterface/Request.h index 6613188666b..19054aa74c2 100644 --- a/TAO/tao/DynamicInterface/Request.h +++ b/TAO/tao/DynamicInterface/Request.h @@ -40,11 +40,7 @@ #endif /* TAO_HAS_AMI */ #include "ace/SString.h" -#if defined (ACE_HAS_CPP11) -# include <atomic> -#else -# include "ace/Atomic_Op.h" -#endif /* ACE_HAS_CPP11 */ +#include <atomic> TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -248,11 +244,7 @@ namespace CORBA CORBA::Context_ptr ctx_; /// Reference counting. -#if defined (ACE_HAS_CPP11) std::atomic<uint32_t> refcount_; -#else - ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; -#endif /* ACE_HAS_CPP11 */ /// Protect the response_received_. TAO_SYNCH_MUTEX lock_; diff --git a/TAO/tao/DynamicInterface/Server_Request.cpp b/TAO/tao/DynamicInterface/Server_Request.cpp index e946d3179b8..6c4fcd680da 100644 --- a/TAO/tao/DynamicInterface/Server_Request.cpp +++ b/TAO/tao/DynamicInterface/Server_Request.cpp @@ -37,7 +37,7 @@ CORBA::ServerRequest::_decr_refcount (void) } CORBA::ServerRequest::ServerRequest (TAO_ServerRequest &orb_server_request) - : lazy_evaluation_ (0), + : lazy_evaluation_ (false), ctx_ (CORBA::Context::_nil ()), params_ (CORBA::NVList::_nil ()), retval_ (0), diff --git a/TAO/tao/DynamicInterface/Server_Request.h b/TAO/tao/DynamicInterface/Server_Request.h index 555e1c4f8f7..8532a92c237 100644 --- a/TAO/tao/DynamicInterface/Server_Request.h +++ b/TAO/tao/DynamicInterface/Server_Request.h @@ -29,11 +29,7 @@ #include "tao/TAO_Server_Request.h" #include "tao/CDR.h" -#if defined (ACE_HAS_CPP11) -# include <atomic> -#else -# include "ace/Atomic_Op.h" -#endif /* ACE_HAS_CPP11 */ +#include <atomic> TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -150,11 +146,7 @@ namespace CORBA CORBA::Any_ptr exception_; /// Reference counting. -#if defined (ACE_HAS_CPP11) std::atomic<uint32_t> refcount_; -#else - ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; -#endif /* ACE_HAS_CPP11 */ /// Request from the ORB. TAO_ServerRequest &orb_server_request_; diff --git a/TAO/tao/Dynamic_Adapter.cpp b/TAO/tao/Dynamic_Adapter.cpp index 76a6e2bb58d..3c0641d1acc 100644 --- a/TAO/tao/Dynamic_Adapter.cpp +++ b/TAO/tao/Dynamic_Adapter.cpp @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Dynamic_Adapter::~TAO_Dynamic_Adapter (void) +TAO_Dynamic_Adapter::~TAO_Dynamic_Adapter () { } diff --git a/TAO/tao/Dynamic_TP/DTP_Config.h b/TAO/tao/Dynamic_TP/DTP_Config.h index 9cda4ab6d86..1cb1cb90ead 100644 --- a/TAO/tao/Dynamic_TP/DTP_Config.h +++ b/TAO/tao/Dynamic_TP/DTP_Config.h @@ -47,7 +47,6 @@ struct TAO_Dynamic_TP_Export TAO_DTP_Definition stack_size_(ACE_DEFAULT_THREAD_STACKSIZE), timeout_(60,0), queue_depth_(0){} - }; class TAO_Dynamic_TP_Export TAO_DTP_Config_Registry_Installer @@ -101,7 +100,6 @@ private: int parse_string (int &curarg, int argc, ACE_TCHAR* argv[], const ACE_TCHAR *match, ACE_TCHAR *&value); void report_option_value_error (const ACE_TCHAR* option_name, const ACE_TCHAR* option_value); - }; static TAO_DTP_Config_Registry_Installer config_installer; diff --git a/TAO/tao/Dynamic_TP/DTP_ORBInitializer.h b/TAO/tao/Dynamic_TP/DTP_ORBInitializer.h index b3aa6d5ffd4..fd884660896 100644 --- a/TAO/tao/Dynamic_TP/DTP_ORBInitializer.h +++ b/TAO/tao/Dynamic_TP/DTP_ORBInitializer.h @@ -42,7 +42,6 @@ class TAO_DTP_ORBInitializer , public virtual ::CORBA::LocalObject { public: - TAO_DTP_ORBInitializer (void); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); @@ -50,11 +49,8 @@ public: virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); private: - /// Register Dynamic_TP policy factories. void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info); - -private: }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Dynamic_TP/DTP_ORB_Loader.h b/TAO/tao/Dynamic_TP/DTP_ORB_Loader.h index b1a30f0a276..8b81afd949f 100644 --- a/TAO/tao/Dynamic_TP/DTP_ORB_Loader.h +++ b/TAO/tao/Dynamic_TP/DTP_ORB_Loader.h @@ -33,7 +33,6 @@ class TAO_ORB_Core; class TAO_Dynamic_TP_Export TAO_DTP_ORB_Loader : public ACE_Service_Object { public: - /// Constructor. TAO_DTP_ORB_Loader (void); diff --git a/TAO/tao/Dynamic_TP/DTP_POA_Loader.h b/TAO/tao/Dynamic_TP/DTP_POA_Loader.h index 530af5a0300..a0a021149f0 100644 --- a/TAO/tao/Dynamic_TP/DTP_POA_Loader.h +++ b/TAO/tao/Dynamic_TP/DTP_POA_Loader.h @@ -31,7 +31,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Dynamic_TP_Export TAO_DTP_POA_Loader : public ACE_Service_Object { public: - /// Constructor. TAO_DTP_POA_Loader (void); diff --git a/TAO/tao/Dynamic_TP/DTP_POA_Strategy.h b/TAO/tao/Dynamic_TP/DTP_POA_Strategy.h index 2d8608d0960..3b9acd43681 100644 --- a/TAO/tao/Dynamic_TP/DTP_POA_Strategy.h +++ b/TAO/tao/Dynamic_TP/DTP_POA_Strategy.h @@ -32,10 +32,8 @@ #include "tao/Intrusive_Ref_Count_Handle_T.h" #include "ace/OS_NS_strings.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_DTP_POA_Strategy; typedef TAO_Intrusive_Ref_Count_Handle<TAO_DTP_POA_Strategy> TAO_DTP_POA_Strategy_Handle; @@ -58,7 +56,6 @@ class TAO_Dynamic_TP_Export TAO_DTP_POA_Strategy: public TAO::CSD::Strategy_Base { public: - /// Constructors. /// This constructor supports situations where dynamic instantiation /// of a thread pool for POAs is initiated from a svc.conf file. @@ -110,7 +107,6 @@ class TAO_Dynamic_TP_Export TAO_DTP_POA_Strategy: /// This is requested on the user application level. void cancel_requests(PortableServer::Servant servant); - protected: /// Handle the dispatching of a remote request. /// @@ -157,8 +153,6 @@ class TAO_Dynamic_TP_Export TAO_DTP_POA_Strategy: const PortableServer::ObjectId& oid); private: - - /** * Helper method that is responsible for looking up the servant * state object in the servant state map *if* the "serialize @@ -201,10 +195,8 @@ class TAO_Dynamic_TP_Export TAO_DTP_POA_Strategy: /// been sent in from an application or, if false, needs to be /// looked up from a Dynamic TP Config repo. It works in conjunction with /// dynamic_tp_config_name_ above. - bool config_initialized_; - void set_dtp_config(TAO_DTP_Definition &tp_config); }; diff --git a/TAO/tao/Dynamic_TP/DTP_Task.cpp b/TAO/tao/Dynamic_TP/DTP_Task.cpp index e587d7eb746..80a3bbd2dd2 100644 --- a/TAO/tao/Dynamic_TP/DTP_Task.cpp +++ b/TAO/tao/Dynamic_TP/DTP_Task.cpp @@ -153,8 +153,7 @@ TAO_DTP_Task::open (void* /* args */) this->max_pool_threads_, this->max_request_queue_depth_, this->thread_stack_size_, - this->thread_idle_time_.sec ()) - ); + this->thread_idle_time_.sec ())); } // We can't activate 0 threads. Make sure this isn't the case. @@ -346,7 +345,7 @@ TAO_DTP_Task::svc (void) ACE_TEXT ("TAO (%P|%t) - DTP_Task::svc() ") ACE_TEXT ("Decrementing busy_threads_. ") ACE_TEXT ("Busy thread count:%d\n"), - this->busy_threads_.value())); + this->busy_threads_.load())); } ACE_Time_Value tmp_sec = this->thread_idle_time_.to_absolute_time(); @@ -386,7 +385,7 @@ TAO_DTP_Task::svc (void) ACE_TEXT ("TAO (%P|%t) - DTP_Task::svc() ") ACE_TEXT ("Incrementing busy_threads_. ") ACE_TEXT ("Busy thread count:%d\n"), - this->busy_threads_.value ())); + this->busy_threads_.load ())); } } } diff --git a/TAO/tao/Dynamic_TP/DTP_Task.h b/TAO/tao/Dynamic_TP/DTP_Task.h index 77f2cfabdd4..c39e3b57772 100644 --- a/TAO/tao/Dynamic_TP/DTP_Task.h +++ b/TAO/tao/Dynamic_TP/DTP_Task.h @@ -31,178 +31,178 @@ #include "ace/Synch.h" #include "ace/Containers_T.h" #include "ace/Vector_T.h" +#include <atomic> TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** - * @class TP_Task - * - * @brief Active Object managing a queue of request objects. - * - * There are two types of "users" of a TP_Task object: - * - * 1) The TP_Strategy object that "owns" this task object. - * 2) The worker threads that "run" this task object as an - * "active object". - * - * The TP_Strategy object that "owns" this task object dictates - * when the worker threads are activated and when they are shutdown. It - * also injects requests into this task's queue via calls to the - * add_request() method. It is also the TP_Strategy object that - * dictates the number of worker threads to be activated via a call to - * the set_num_threads() method. - * - * The active object pattern is implemented via the use of the - * the ACE_Task_Base base class, and each worker thread will - * invoke this task's svc() method, and when the svc() returns, the - * worker thread will invoke this task's close() method (with the - * flag argument equal to 0). - */ - class TAO_Dynamic_TP_Export TAO_DTP_Task : public ACE_Task_Base - { - public: - - /// Default Constructor. - TAO_DTP_Task(); +/** + * @class TP_Task + * + * @brief Active Object managing a queue of request objects. + * + * There are two types of "users" of a TP_Task object: + * + * 1) The TP_Strategy object that "owns" this task object. + * 2) The worker threads that "run" this task object as an + * "active object". + * + * The TP_Strategy object that "owns" this task object dictates + * when the worker threads are activated and when they are shutdown. It + * also injects requests into this task's queue via calls to the + * add_request() method. It is also the TP_Strategy object that + * dictates the number of worker threads to be activated via a call to + * the set_num_threads() method. + * + * The active object pattern is implemented via the use of the + * the ACE_Task_Base base class, and each worker thread will + * invoke this task's svc() method, and when the svc() returns, the + * worker thread will invoke this task's close() method (with the + * flag argument equal to 0). + */ +class TAO_Dynamic_TP_Export TAO_DTP_Task : public ACE_Task_Base +{ +public: - /// Virtual Destructor. - virtual ~TAO_DTP_Task(); + /// Default Constructor. + TAO_DTP_Task(); - struct Open_Args { - TAO_DTP_Definition task_thread_config; - }; + /// Virtual Destructor. + virtual ~TAO_DTP_Task(); + struct Open_Args { + TAO_DTP_Definition task_thread_config; + }; - /// Put a request object on to the request queue. - /// Returns true if successful, false otherwise (it has been "rejected"). - bool add_request(TAO::CSD::TP_Request* request); - /// Activate the worker threads - virtual int open(void* args = 0); + /// Put a request object on to the request queue. + /// Returns true if successful, false otherwise (it has been "rejected"). + bool add_request(TAO::CSD::TP_Request* request); - /// The "mainline" executed by each worker thread. - virtual int svc(); + /// Activate the worker threads + virtual int open(void* args = 0); - virtual int close (u_long flag = 0); + /// The "mainline" executed by each worker thread. + virtual int svc(); - /// Set the thread and queue config. + virtual int close (u_long flag = 0); - void set_init_pool_threads(size_t thr_count); + /// Set the thread and queue config. - void set_min_pool_threads(size_t thr_count); + void set_init_pool_threads(size_t thr_count); - void set_max_pool_threads(size_t thr_count); + void set_min_pool_threads(size_t thr_count); - void set_thread_stack_size(size_t stack_sz); + void set_max_pool_threads(size_t thr_count); - void set_thread_idle_time(ACE_Time_Value thr_timeout); + void set_thread_stack_size(size_t stack_sz); - void set_max_request_queue_depth(size_t queue_depth); + void set_thread_idle_time(ACE_Time_Value thr_timeout); - /// Get the thread and queue config. + void set_max_request_queue_depth(size_t queue_depth); - size_t get_init_pool_threads(); + /// Get the thread and queue config. - size_t get_min_pool_threads(); + size_t get_init_pool_threads(); - size_t get_max_pool_threads(); + size_t get_min_pool_threads(); - size_t get_max_request_queue_depth(); + size_t get_max_pool_threads(); - size_t get_thread_stack_size(); + size_t get_max_request_queue_depth(); - time_t get_thread_idle_time(); + size_t get_thread_stack_size(); - /// Cancel all requests that are targeted for the provided servant. - void cancel_servant (PortableServer::Servant servant); + time_t get_thread_idle_time(); - private: - /// get the next available request. Return true if one available, nonblocking - bool request_ready (TAO::CSD::TP_Dispatchable_Visitor &v, - TAO::CSD::TP_Request_Handle &r); + /// Cancel all requests that are targeted for the provided servant. + void cancel_servant (PortableServer::Servant servant); - /// release the request, reset the accepting flag if necessary - void clear_request (TAO::CSD::TP_Request_Handle &r); +private: + /// get the next available request. Return true if one available, nonblocking + bool request_ready (TAO::CSD::TP_Dispatchable_Visitor &v, + TAO::CSD::TP_Request_Handle &r); - void add_busy (void); - void remove_busy (void); - void add_active (void); - bool remove_active (bool); - bool need_active (void); - bool above_minimum (void); + /// release the request, reset the accepting flag if necessary + void clear_request (TAO::CSD::TP_Request_Handle &r); - typedef TAO_SYNCH_MUTEX LockType; - typedef TAO_Condition<LockType> ConditionType; + void add_busy (void); + void remove_busy (void); + void add_active (void); + bool remove_active (bool); + bool need_active (void); + bool above_minimum (void); - /// Lock used to synchronize the "active_workers_" condition - LockType aw_lock_; - /// Lock used to synchronize manipulation of the queue - LockType queue_lock_; - /// Lock used to synchronize the "work_available_" condition - LockType work_lock_; + typedef TAO_SYNCH_MUTEX LockType; + typedef TAO_Condition<LockType> ConditionType; - /// Condition used to signal worker threads that they may be able to - /// find a request in the queue_ that needs to be dispatched to a - /// servant that is currently "not busy". - /// This condition will be signal()'ed each time a new request is - /// added to the queue_, and also when a servant has become "not busy". - ConditionType work_available_; + /// Lock used to synchronize the "active_workers_" condition + LockType aw_lock_; + /// Lock used to synchronize manipulation of the queue + LockType queue_lock_; + /// Lock used to synchronize the "work_available_" condition + LockType work_lock_; - /// This condition will be signal()'ed each time the num_threads_ - /// data member has its value changed. This is used to keep the - /// close(1) invocation (ie, a shutdown request) blocked until all - /// of the worker threads have stopped running. - ConditionType active_workers_; + /// Condition used to signal worker threads that they may be able to + /// find a request in the queue_ that needs to be dispatched to a + /// servant that is currently "not busy". + /// This condition will be signal()'ed each time a new request is + /// added to the queue_, and also when a servant has become "not busy". + ConditionType work_available_; - /// The number of threads that are currently active. This may be - /// different than the total number of threads since the latter - /// may include threads that are shutting down but not reaped. - size_t active_count_; + /// This condition will be signal()'ed each time the num_threads_ + /// data member has its value changed. This is used to keep the + /// close(1) invocation (ie, a shutdown request) blocked until all + /// of the worker threads have stopped running. + ConditionType active_workers_; - /// Flag used to indicate when this task will (or will not) accept - /// requests via the the add_request() method. - bool accepting_requests_; + /// The number of threads that are currently active. This may be + /// different than the total number of threads since the latter + /// may include threads that are shutting down but not reaped. + size_t active_count_; - /// Flag used to initiate a shutdown request to all worker threads. - bool shutdown_; + /// Flag used to indicate when this task will (or will not) accept + /// requests via the the add_request() method. + bool accepting_requests_; - /// Flag to indicate something is on the queue. works in conjunction with - /// the work_available condition - bool check_queue_; + /// Flag used to initiate a shutdown request to all worker threads. + bool shutdown_; - /// Flag used to avoid multiple open() calls. - bool opened_; + /// Flag to indicate something is on the queue. works in conjunction with + /// the work_available condition + bool check_queue_; - /// The number of requests in the local queue. - size_t num_queue_requests_; + /// Flag used to avoid multiple open() calls. + bool opened_; - /// The number of currently active worker threads. - ACE_Atomic_Op <TAO_SYNCH_MUTEX, unsigned long> busy_threads_; + /// The number of requests in the local queue. + size_t num_queue_requests_; - /// The queue of pending servant requests (a.k.a. the "request queue"). - TAO::CSD::TP_Queue queue_; + /// The number of currently active worker threads. + std::atomic<unsigned long> busy_threads_; - /// The low water mark for dynamic threads to settle to. - size_t init_pool_threads_; + /// The queue of pending servant requests (a.k.a. the "request queue"). + TAO::CSD::TP_Queue queue_; - /// The low water mark for dynamic threads to settle to. - size_t min_pool_threads_; + /// The low water mark for dynamic threads to settle to. + size_t init_pool_threads_; - /// The high water mark for dynamic threads to be limited to. - size_t max_pool_threads_; + /// The low water mark for dynamic threads to settle to. + size_t min_pool_threads_; - /// If the max_pool_threads_ value has been met, then ORB requests coming in can be queued. - /// This is the maximum number that will be allowed. - size_t max_request_queue_depth_; + /// The high water mark for dynamic threads to be limited to. + size_t max_pool_threads_; - /// This is the memory stack size allowable for each thread. - size_t thread_stack_size_; + /// If the max_pool_threads_ value has been met, then ORB requests coming in can be queued. + /// This is the maximum number that will be allowed. + size_t max_request_queue_depth_; - /// This is the maximum amount of time in seconds that an idle thread can - /// stay alive before being taken out of the pool. - ACE_Time_Value thread_idle_time_; - }; + /// This is the memory stack size allowable for each thread. + size_t thread_stack_size_; + /// This is the maximum amount of time in seconds that an idle thread can + /// stay alive before being taken out of the pool. + ACE_Time_Value thread_idle_time_; +}; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp index a51873958c1..bfc7bcc1a0d 100644 --- a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp +++ b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp @@ -519,11 +519,7 @@ CORBA::ULong TAO_DTP_Thread_Pool_Manager::create_threadpool_helper (TAO_DTP_Thread_Pool *thread_pool) { // Make sure of safe deletion in case of errors. -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO_DTP_Thread_Pool> safe_thread_pool (thread_pool); -#else - auto_ptr<TAO_DTP_Thread_Pool> safe_thread_pool (thread_pool); -#endif /* ACE_HAS_CPP11 */ // Open the pool. thread_pool->open (); diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h index 520d3e5964c..df83f5f3124 100644 --- a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h +++ b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h @@ -48,7 +48,6 @@ class TAO_Dynamic_TP_Export TAO_DTP_New_Leader_Generator : public TAO_New_Leader_Generator { public: - /// Constructor. TAO_DTP_New_Leader_Generator (TAO_DTP_Thread_Pool &lane); @@ -57,7 +56,6 @@ public: bool no_leaders_available (void); private: - /// Pool associated with this leader generator. TAO_DTP_Thread_Pool &pool_; }; @@ -243,7 +241,6 @@ public: // @} private: - /// @name Helpers // @{ @@ -255,7 +252,6 @@ private: // @} private: - TAO_ORB_Core &orb_core_; THREAD_POOLS thread_pools_; diff --git a/TAO/tao/Endpoint.cpp b/TAO/tao/Endpoint.cpp index 7142c6ab8fe..2fc670189d8 100644 --- a/TAO/tao/Endpoint.cpp +++ b/TAO/tao/Endpoint.cpp @@ -7,18 +7,16 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Endpoint::~TAO_Endpoint (void) +TAO_Endpoint::~TAO_Endpoint () { } TAO_Endpoint * TAO_Endpoint::next_filtered (TAO_ORB_Core *, TAO_Endpoint *root) { - if (root == 0) + if (root == nullptr) return this; return this->next(); } TAO_END_VERSIONED_NAMESPACE_DECL - -//@@ TAO_ENDPOINT_SPL_METHODS_ADD_HOOK diff --git a/TAO/tao/Endpoint.h b/TAO/tao/Endpoint.h index 130f465c02d..f4a943177b9 100644 --- a/TAO/tao/Endpoint.h +++ b/TAO/tao/Endpoint.h @@ -28,12 +28,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_ORB_Core; -/* - * Includes and forward decls for specializing TAO's - * endpoint implementation. - */ -//@@ TAO_ENDPOINT_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK - /** * @class TAO_Endpoint * @@ -119,12 +113,6 @@ public: /// Return a hash value for this object. virtual CORBA::ULong hash (void) = 0; - /* - * Hook to add public methods from derived class onto base - * Endpoint class. - */ - //@@ TAO_ENDPOINT_SPL_PUBLIC_METHODS_ADD_HOOK - protected: /// Lock for the address lookup. /** @@ -150,20 +138,11 @@ protected: CORBA::Short priority_; private: - /// Endpoints should not be copied. TAO_Endpoint (const TAO_Endpoint&); void operator= (const TAO_Endpoint&); - - /* - * Addition of private members from derived class. - */ - //@@ TAO_ENDPOINT_SPL_PRIVATE_DATA_ADD_HOOK - }; -//@@ TAO_ENDPOINT_SPL_EXTERN_ADD_HOOK - TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) diff --git a/TAO/tao/Endpoint_Selector_Factory.cpp b/TAO/tao/Endpoint_Selector_Factory.cpp index 7078166b809..aaa972099ba 100644 --- a/TAO/tao/Endpoint_Selector_Factory.cpp +++ b/TAO/tao/Endpoint_Selector_Factory.cpp @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Endpoint_Selector_Factory::~TAO_Endpoint_Selector_Factory (void) +TAO_Endpoint_Selector_Factory::~TAO_Endpoint_Selector_Factory () { } diff --git a/TAO/tao/Environment.cpp b/TAO/tao/Environment.cpp index 5f4cb9a9d53..779bea6f483 100644 --- a/TAO/tao/Environment.cpp +++ b/TAO/tao/Environment.cpp @@ -11,22 +11,22 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -CORBA::Environment::Environment (void) - : exception_ (0) - , previous_ (0) +CORBA::Environment::Environment () + : exception_ (nullptr) + , previous_ (nullptr) { } CORBA::Environment::Environment (const CORBA::Environment& rhs) - : exception_ (0) - , previous_ (0) + : exception_ (nullptr) + , previous_ (nullptr) { if (rhs.exception_) this->exception_ = rhs.exception_->_tao_duplicate (); } CORBA::Environment::Environment (TAO_ORB_Core* orb_core) - : exception_ (0) + : exception_ (nullptr) , previous_ (orb_core->default_environment ()) { orb_core->default_environment (this); @@ -49,14 +49,14 @@ CORBA::Environment::operator= (const CORBA::Environment& rhs) return *this; } -CORBA::Environment::~Environment (void) +CORBA::Environment::~Environment () { this->clear (); // If previous is 0 then this is the first Environment, allocated // with the ORB, it shouldn't try to pop because the ORB is being // destroyed also. - if (this->previous_ != 0) + if (this->previous_ != nullptr) TAO_ORB_Core_instance ()->default_environment (this->previous_); } @@ -84,15 +84,15 @@ CORBA::Environment::exception (CORBA::Exception *ex) this->exception_ = ex; - if (this->exception_ != 0) + if (this->exception_ != nullptr) this->exception_->_raise (); } void -CORBA::Environment::clear (void) +CORBA::Environment::clear () { delete this->exception_; - this->exception_ = 0; + this->exception_ = nullptr; } CORBA::Environment& @@ -118,7 +118,7 @@ CORBA::Environment::default_environment () // Convenience -- say if the exception is a system exception or not. int -CORBA::Environment::exception_type (void) const +CORBA::Environment::exception_type () const { // @@ Carlos, is this stuff that's properly "transformed" for EBCDIC // platforms?! @@ -156,10 +156,10 @@ CORBA::Environment::exception_type (void) const } const char* -CORBA::Environment::exception_id (void) const +CORBA::Environment::exception_id () const { - if (this->exception_ == 0) - return 0; + if (this->exception_ == nullptr) + return nullptr; return this->exception_->_rep_id (); } @@ -182,7 +182,7 @@ CORBA::Environment::print_exception (const char *info, CORBA::SystemException *x2 = CORBA::SystemException::_downcast (this->exception_); - if (x2 != 0) + if (x2 != nullptr) x2->_tao_print_system_exception (); else // @@ we can use the exception's typecode to dump all the data diff --git a/TAO/tao/Environment.h b/TAO/tao/Environment.h index 8b3e2269022..d381afd7329 100644 --- a/TAO/tao/Environment.h +++ b/TAO/tao/Environment.h @@ -74,7 +74,7 @@ namespace CORBA public: /// The default constructor. The environment will hold no /// exceptions. - Environment (void); + Environment (); /// Copy constructor. Environment (const Environment &ACE_TRY_ENV); @@ -83,11 +83,11 @@ namespace CORBA Environment &operator=(const Environment &ACE_TRY_ENV); /// Destructor, release the exception. - ~Environment (void); + ~Environment (); /// Some static methods that need to be defined in every pseudo object static Environment * _duplicate (Environment *); - static Environment * _nil (void); + static Environment * _nil (); /// Return the contained CORBA::Exception. /** @@ -98,7 +98,7 @@ namespace CORBA * "C++ Language Mapping" (formal/00-01-02). Section 1.27 * Environment (page 1-113) */ - CORBA::Exception* exception (void) const; + CORBA::Exception* exception () const; /// Set the contained CORBA::Exception to @a ex /** @@ -114,20 +114,20 @@ namespace CORBA /// Return if the exception is a user exception or a system /// exception. - int exception_type (void) const; + int exception_type () const; /// return the repository ID for the exception. - const char *exception_id (void) const; + const char *exception_id () const; /// Clear the exception. - void clear (void); + void clear (); /// Print the exception to output determined by f. This function /// is not CORBA compliant. void print_exception (const char *info, FILE *f=stdout) const; // = Obtain a default environment to use with TAO. - static CORBA::Environment &default_environment (void); + static CORBA::Environment &default_environment (); // Useful for template programming. typedef CORBA::Environment_ptr _ptr_type; diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp index b6de9c41fce..a0234612fc2 100644 --- a/TAO/tao/Exception.cpp +++ b/TAO/tao/Exception.cpp @@ -45,13 +45,13 @@ CORBA::Exception::Exception (const CORBA::Exception &src) // responsible for releasing any storage owned by the exception. It // can do this because it's got the local name and the id. -CORBA::Exception::Exception (void) +CORBA::Exception::Exception () : id_ (), name_ () { } -CORBA::Exception::~Exception (void) +CORBA::Exception::~Exception () { } @@ -68,13 +68,13 @@ CORBA::Exception::operator= (const CORBA::Exception &src) } const char * -CORBA::Exception::_rep_id (void) const +CORBA::Exception::_rep_id () const { return this->id_.in (); } const char * -CORBA::Exception::_name (void) const +CORBA::Exception::_name () const { return this->name_.in (); } diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h index 84a1be86263..cec1728c15d 100644 --- a/TAO/tao/Exception.h +++ b/TAO/tao/Exception.h @@ -110,25 +110,25 @@ namespace CORBA Exception (const Exception &src); /// Destructor. - virtual ~Exception (void); + virtual ~Exception (); // = To throw the exception (when using the standard mapping). - virtual void _raise (void) const = 0; + virtual void _raise () const = 0; // = The static narrow operations. static Exception * _downcast (Exception * x); static Exception const * _downcast (Exception const * x); /// Return the repository ID of the Exception. - virtual const char * _rep_id (void) const; + virtual const char * _rep_id () const; /// Return the name of the Exception. - virtual const char * _name (void) const; + virtual const char * _name () const; // = These are TAO-specific extensions. /// Will be overridden in the concrete derived classes. - virtual CORBA::TypeCode_ptr _tao_type (void) const = 0; + virtual CORBA::TypeCode_ptr _tao_type () const = 0; /// Print the exception to output determined by @a f. /** @@ -146,7 +146,7 @@ namespace CORBA /// Returns a string containing information about the exception. This /// function is not CORBA compliant. - virtual ACE_CString _info (void) const = 0; + virtual ACE_CString _info () const = 0; virtual void _tao_encode (TAO_OutputCDR &cdr) const = 0; @@ -171,18 +171,17 @@ namespace CORBA * ACE_NEW_RETURN ( * result, * SomeException (*this), - * 0 - * ); + * 0); * return result; * } * }; * </PRE> */ - virtual CORBA::Exception *_tao_duplicate (void) const = 0; + virtual CORBA::Exception *_tao_duplicate () const = 0; protected: /// Default constructor. - Exception (void); + Exception (); /// Assignment operator. Exception & operator = (const Exception & src); diff --git a/TAO/tao/Exception_Data.h b/TAO/tao/Exception_Data.h index e10b104bf0c..071d6cfd8dc 100644 --- a/TAO/tao/Exception_Data.h +++ b/TAO/tao/Exception_Data.h @@ -35,7 +35,7 @@ namespace TAO // Function pointer returning a pointer to CORBA::Exception. This is used to // describe the allocator for user-defined exceptions that are used internally // by the interpreter. - typedef CORBA::Exception* (*TAO_Exception_Alloc) (void); + typedef CORBA::Exception* (*TAO_Exception_Alloc) (); /** * @struct Exception_Data diff --git a/TAO/tao/Exclusive_TMS.cpp b/TAO/tao/Exclusive_TMS.cpp index 1b414fa7c6f..f7c3e9c936f 100644 --- a/TAO/tao/Exclusive_TMS.cpp +++ b/TAO/tao/Exclusive_TMS.cpp @@ -9,11 +9,11 @@ TAO_Exclusive_TMS::TAO_Exclusive_TMS (TAO_Transport *transport) : TAO_Transport_Mux_Strategy (transport), request_id_generator_ (0), request_id_ (0), - rd_ (0) + rd_ (nullptr) { } -TAO_Exclusive_TMS::~TAO_Exclusive_TMS (void) +TAO_Exclusive_TMS::~TAO_Exclusive_TMS () { } @@ -21,7 +21,7 @@ TAO_Exclusive_TMS::~TAO_Exclusive_TMS (void) // invocation. We can actually return a predecided ULong, since we // allow only one invocation over this connection at a time. CORBA::ULong -TAO_Exclusive_TMS::request_id (void) +TAO_Exclusive_TMS::request_id () { ++this->request_id_generator_; @@ -58,9 +58,9 @@ TAO_Exclusive_TMS::bind_dispatcher (CORBA::ULong request_id, } bool -TAO_Exclusive_TMS::has_request (void) +TAO_Exclusive_TMS::has_request () { - return this->rd_ != 0; + return this->rd_ != nullptr; } int @@ -125,17 +125,17 @@ TAO_Exclusive_TMS::reply_timed_out (CORBA::ULong request_id) } bool -TAO_Exclusive_TMS::idle_after_send (void) +TAO_Exclusive_TMS::idle_after_send () { // if there is no reply dispatcher (possible in case of AMI requests) // release the transport now - if (this->rd_ != 0) + if (this->rd_ != nullptr) { return false; } else { - if (this->transport_ != 0) + if (this->transport_ != nullptr) { // let WS know we're finished this->transport_->wait_strategy ()->finished_request (); @@ -147,12 +147,12 @@ TAO_Exclusive_TMS::idle_after_send (void) } bool -TAO_Exclusive_TMS::idle_after_reply (void) +TAO_Exclusive_TMS::idle_after_reply () { // Irrespective of whether we are successful or not we need to // return true. If *this* class is not successful in idling the // transport no one can. - if (this->transport_ != 0) + if (this->transport_ != nullptr) { // let WS know we're finished this->transport_->wait_strategy ()->finished_request (); @@ -164,9 +164,9 @@ TAO_Exclusive_TMS::idle_after_reply (void) } void -TAO_Exclusive_TMS::connection_closed (void) +TAO_Exclusive_TMS::connection_closed () { - if (this->rd_ != 0) + if (this->rd_ != nullptr) this->rd_->connection_closed (); } diff --git a/TAO/tao/FILE_Parser.cpp b/TAO/tao/FILE_Parser.cpp index 0c9398e27c9..ea0224d4f79 100644 --- a/TAO/tao/FILE_Parser.cpp +++ b/TAO/tao/FILE_Parser.cpp @@ -15,7 +15,7 @@ static const char file_prefix[] = "file:"; TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_FILE_Parser::~TAO_FILE_Parser (void) +TAO_FILE_Parser::~TAO_FILE_Parser () { } @@ -39,14 +39,14 @@ TAO_FILE_Parser::parse_string (const char *ior, CORBA::ORB_ptr orb) FILE* file = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR (filename), ACE_TEXT("r")); - if (file == 0) + if (file == nullptr) return CORBA::Object::_nil (); ACE_Read_Buffer reader (file, true); char* string = reader.read (); - if (string == 0) + if (string == nullptr) return CORBA::Object::_nil (); CORBA::Object_ptr object = CORBA::Object::_nil (); diff --git a/TAO/tao/Fault_Tolerance_Service.cpp b/TAO/tao/Fault_Tolerance_Service.cpp index cee4f82a00a..c38de0e1be8 100644 --- a/TAO/tao/Fault_Tolerance_Service.cpp +++ b/TAO/tao/Fault_Tolerance_Service.cpp @@ -11,7 +11,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Fault_Tolerance_Service::~TAO_Fault_Tolerance_Service (void) +TAO_Fault_Tolerance_Service::~TAO_Fault_Tolerance_Service () { delete this->ft_service_callback_; } @@ -21,7 +21,7 @@ TAO_Fault_Tolerance_Service::init (TAO_ORB_Core *orb_core) { // Look in to the svc conf stuff to get an instance of the // FT_Service. - if (this->ft_service_callback_ == 0) + if (this->ft_service_callback_ == nullptr) { TAO_Services_Activate *service = ACE_Dynamic_Service <TAO_Services_Activate>::instance ("FT_ClientService_Activate"); diff --git a/TAO/tao/Fault_Tolerance_Service.h b/TAO/tao/Fault_Tolerance_Service.h index 5a6e4c7e7e4..e7bd1f7e1af 100644 --- a/TAO/tao/Fault_Tolerance_Service.h +++ b/TAO/tao/Fault_Tolerance_Service.h @@ -41,16 +41,16 @@ class TAO_Export TAO_Fault_Tolerance_Service public: /// Ctor - TAO_Fault_Tolerance_Service (void); + TAO_Fault_Tolerance_Service (); /// Dtor - ~TAO_Fault_Tolerance_Service (void); + ~TAO_Fault_Tolerance_Service (); /// Initialize the internal data structures void init (TAO_ORB_Core *orb_core); /// Return the underlying callback object - TAO_Service_Callbacks *service_callback (void); + TAO_Service_Callbacks *service_callback (); private: void operator= (const TAO_Fault_Tolerance_Service &); diff --git a/TAO/tao/Fixed_Array_Argument_T.h b/TAO/tao/Fixed_Array_Argument_T.h index a33d537d286..83b5f0a45c9 100644 --- a/TAO/tao/Fixed_Array_Argument_T.h +++ b/TAO/tao/Fixed_Array_Argument_T.h @@ -41,7 +41,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - typename S_forany::_slice_type const * arg (void) const; + typename S_forany::_slice_type const * arg () const; protected: S_forany x_; @@ -60,9 +60,9 @@ namespace TAO { public: In_Fixed_Array_Clonable_Argument_T (const typename S_forany::_slice_type * x); - virtual ~In_Fixed_Array_Clonable_Argument_T (void); + virtual ~In_Fixed_Array_Clonable_Argument_T (); - virtual Argument* clone (void); + virtual Argument* clone (); private: bool is_clone_; @@ -86,7 +86,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - typename S_forany::_slice_type * arg (void); + typename S_forany::_slice_type * arg (); private: S_forany x_; @@ -109,7 +109,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - typename S_forany::_slice_type *& arg (void); + typename S_forany::_slice_type *& arg (); private: S_forany x_; @@ -127,16 +127,16 @@ namespace TAO class Ret_Fixed_Array_Argument_T : public RetArgument { public: - Ret_Fixed_Array_Argument_T (void); + Ret_Fixed_Array_Argument_T (); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - typename S_forany::_slice_type *& arg (void); + typename S_forany::_slice_type *& arg (); - typename S_forany::_slice_type * excp (void); - typename S_forany::_slice_type * retn (void); + typename S_forany::_slice_type * excp (); + typename S_forany::_slice_type * retn (); private: S_var x_; diff --git a/TAO/tao/Fixed_Size_Argument_T.h b/TAO/tao/Fixed_Size_Argument_T.h index 706229b5a46..6369762f23d 100644 --- a/TAO/tao/Fixed_Size_Argument_T.h +++ b/TAO/tao/Fixed_Size_Argument_T.h @@ -39,7 +39,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S const & arg (void) const; + S const & arg () const; protected: S const * x_; @@ -58,9 +58,9 @@ namespace TAO { public: In_Fixed_Size_Clonable_Argument_T (S const & x); - virtual ~In_Fixed_Size_Clonable_Argument_T (void); + virtual ~In_Fixed_Size_Clonable_Argument_T (); - virtual Argument* clone (void); + virtual Argument* clone (); private: bool is_clone_; @@ -84,7 +84,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S & arg (void); + S & arg (); private: S * x_; @@ -107,7 +107,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S & arg (void); + S & arg (); private: S & x_; @@ -124,15 +124,15 @@ namespace TAO class Ret_Fixed_Size_Argument_T : public RetArgument { public: - Ret_Fixed_Size_Argument_T (void); + Ret_Fixed_Size_Argument_T (); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S & arg (void); - S excp (void); - S retn (void); + S & arg (); + S excp (); + S retn (); protected: S x_; diff --git a/TAO/tao/Flushing_Strategy.cpp b/TAO/tao/Flushing_Strategy.cpp index c14d50a30a5..0da9874cc48 100644 --- a/TAO/tao/Flushing_Strategy.cpp +++ b/TAO/tao/Flushing_Strategy.cpp @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Flushing_Strategy::~TAO_Flushing_Strategy (void) +TAO_Flushing_Strategy::~TAO_Flushing_Strategy () { } diff --git a/TAO/tao/GIOP_Fragmentation_Strategy.cpp b/TAO/tao/GIOP_Fragmentation_Strategy.cpp index 77e62f54c1f..96c4dd80bbc 100644 --- a/TAO/tao/GIOP_Fragmentation_Strategy.cpp +++ b/TAO/tao/GIOP_Fragmentation_Strategy.cpp @@ -1,6 +1,6 @@ #include "tao/GIOP_Fragmentation_Strategy.h" -TAO_GIOP_Fragmentation_Strategy::~TAO_GIOP_Fragmentation_Strategy (void) +TAO_GIOP_Fragmentation_Strategy::~TAO_GIOP_Fragmentation_Strategy () { } diff --git a/TAO/tao/GIOP_Fragmentation_Strategy.h b/TAO/tao/GIOP_Fragmentation_Strategy.h index be6d1f43034..47ff70e4865 100644 --- a/TAO/tao/GIOP_Fragmentation_Strategy.h +++ b/TAO/tao/GIOP_Fragmentation_Strategy.h @@ -38,10 +38,10 @@ class TAO_Export TAO_GIOP_Fragmentation_Strategy { public: /// Constructor - TAO_GIOP_Fragmentation_Strategy (void) {} + TAO_GIOP_Fragmentation_Strategy () {} /// Destructor. - virtual ~TAO_GIOP_Fragmentation_Strategy (void); + virtual ~TAO_GIOP_Fragmentation_Strategy (); /// Fragment the (potentially partially) encoded GIOP message. /** @@ -68,9 +68,10 @@ public: ACE_CDR::ULong pending_length) = 0; private: - // Disallow copying and assignment. - TAO_GIOP_Fragmentation_Strategy (TAO_GIOP_Fragmentation_Strategy const &); - void operator= (TAO_GIOP_Fragmentation_Strategy const &); + TAO_GIOP_Fragmentation_Strategy (TAO_GIOP_Fragmentation_Strategy const &) = delete; + void operator= (TAO_GIOP_Fragmentation_Strategy const &) = delete; + TAO_GIOP_Fragmentation_Strategy (TAO_GIOP_Fragmentation_Strategy&&) = delete; + void operator= (TAO_GIOP_Fragmentation_Strategy &&) = delete; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp index 355b3190fb8..9b42415725f 100644 --- a/TAO/tao/GIOP_Message_Base.cpp +++ b/TAO/tao/GIOP_Message_Base.cpp @@ -14,11 +14,6 @@ #include "tao/ZIOP_Adapter.h" #include "ace/Min_Max.h" -/* - * Hook to add additional include files during specializations. - */ -//@@ GIOP_MESSAGE_BASE_INCLUDE_ADD_HOOK - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_GIOP_Message_Base::TAO_GIOP_Message_Base (TAO_ORB_Core *orb_core, @@ -26,7 +21,7 @@ TAO_GIOP_Message_Base::TAO_GIOP_Message_Base (TAO_ORB_Core *orb_core, size_t input_cdr_size) : orb_core_ (orb_core) , fragmentation_strategy_ (orb_core->fragmentation_strategy (transport)) - , out_stream_ (0, + , out_stream_ (nullptr, input_cdr_size, TAO_ENCAP_BYTE_ORDER, orb_core->output_cdr_buffer_allocator (), @@ -51,7 +46,7 @@ TAO_GIOP_Message_Base::TAO_GIOP_Message_Base (TAO_ORB_Core *orb_core, } -TAO_GIOP_Message_Base::~TAO_GIOP_Message_Base (void) +TAO_GIOP_Message_Base::~TAO_GIOP_Message_Base () { #if defined (TAO_HAS_MONITOR_POINTS) && (TAO_HAS_MONITOR_POINTS == 1) this->out_stream_.unregister_monitor (); @@ -67,7 +62,7 @@ TAO_GIOP_Message_Base::init (CORBA::Octet major, CORBA::Octet minor) } TAO_OutputCDR & -TAO_GIOP_Message_Base::out_stream (void) +TAO_GIOP_Message_Base::out_stream () { return this->out_stream_; } @@ -238,10 +233,10 @@ TAO_GIOP_Message_Base::dump_consolidated_msg (TAO_OutputCDR &stream) // Check whether the output cdr stream is build up of multiple // messageblocks. If so, consolidate them to one block that can be // dumped - ACE_Message_Block* consolidated_block = 0; + ACE_Message_Block* consolidated_block = nullptr; char *buf = const_cast <char*> (stream.buffer ()); size_t const total_len = stream.total_length (); - if (stream.begin()->cont () != 0) + if (stream.begin()->cont () != nullptr) { ACE_NEW_RETURN (consolidated_block, ACE_Message_Block, 0); ACE_CDR::consolidate (consolidated_block, stream.begin ()); @@ -251,7 +246,7 @@ TAO_GIOP_Message_Base::dump_consolidated_msg (TAO_OutputCDR &stream) this->dump_msg ("send", reinterpret_cast <u_char *> (buf), total_len); delete consolidated_block; - consolidated_block = 0; + consolidated_block = nullptr; return 0; } @@ -391,7 +386,7 @@ TAO_GIOP_Message_Base::extract_next_message (ACE_Message_Block &incoming, qd = this->make_queued_data (buf_size); - if (qd == 0) + if (qd == nullptr) { if (TAO_debug_level > 0) { @@ -411,7 +406,7 @@ TAO_GIOP_Message_Base::extract_next_message (ACE_Message_Block &incoming, else { // handle not initialized variables - qd = 0; // reset + qd = nullptr; // reset } return 0; @@ -427,7 +422,7 @@ TAO_GIOP_Message_Base::extract_next_message (ACE_Message_Block &incoming, qd = this->make_queued_data (copying_len); - if (qd == 0) + if (qd == nullptr) { if (TAO_debug_level > 0) { @@ -615,7 +610,7 @@ TAO_GIOP_Message_Base::process_request_message (TAO_Transport *transport, ACE_Message_Block::MB_DATA, repbuf, this->orb_core_->input_cdr_buffer_allocator (), - 0, + nullptr, ACE_Message_Block::DONT_DELETE, this->orb_core_->input_cdr_dblock_allocator ()); @@ -652,7 +647,7 @@ TAO_GIOP_Message_Base::process_request_message (TAO_Transport *transport, // we pass it on to the higher layers of the ORB. So we dont to any // copies at all here. The same is also done in the higher layers. - ACE_Data_Block *db = 0; + ACE_Data_Block *db = nullptr; // Get the flag in the message block ACE_Message_Block::Message_Flags flg = qd->msg_block ()->self_flags (); @@ -773,7 +768,7 @@ TAO_GIOP_Message_Base::process_reply_message ( size_t wr_pos = qd->msg_block ()->wr_ptr () - qd->msg_block ()->base (); rd_pos += TAO_GIOP_MESSAGE_HEADER_LEN; - ACE_Data_Block *db = 0; + ACE_Data_Block *db = nullptr; // Get the flag in the message block ACE_Message_Block::Message_Flags flg = qd->msg_block ()->self_flags (); @@ -852,7 +847,7 @@ TAO_GIOP_Message_Base::process_reply_message ( return retval; params.input_cdr_ = &input_cdr; - params.transport_->assign_translators (params.input_cdr_, 0); + params.transport_->assign_translators (params.input_cdr_, nullptr); retval = params.transport_->tms ()->dispatch_reply (params); @@ -980,21 +975,12 @@ TAO_GIOP_Message_Base::process_request ( CORBA::Object_var forward_to; - /* - * Hook to specialize request processing within TAO - * This hook will be replaced by specialized request - * processing implementation. - */ -//@@ TAO_DISPATCH_RESOLUTION_OPT_COMMENT_HOOK_START - // Do this before the reply is sent. this->orb_core_->request_dispatcher ()->dispatch ( this->orb_core_, request, forward_to); -//@@ TAO_DISPATCH_RESOLUTION_OPT_COMMENT_HOOK_END - if (request.is_forwarded ()) { CORBA::Boolean const permanent_forward_condition = @@ -1016,9 +1002,9 @@ TAO_GIOP_Message_Base::process_request ( &request.reply_service_info ()); output.message_attributes (request_id, - 0, + nullptr, TAO_Message_Semantics (TAO_Message_Semantics::TAO_REPLY), - 0); + nullptr); // Make the GIOP header and Reply header this->generate_reply_header (output, reply_params); @@ -1036,7 +1022,7 @@ TAO_GIOP_Message_Base::process_request ( output.more_fragments (false); int const result = transport->send_message (output, - 0, + nullptr, &request, TAO_Message_Semantics (TAO_Message_Semantics::TAO_REPLY)); if (result == -1) @@ -1290,8 +1276,8 @@ TAO_GIOP_Message_Base::make_send_locate_reply (TAO_Transport *transport, // Send the message int const result = transport->send_message (output, - 0, - 0, + nullptr, + nullptr, TAO_Message_Semantics (TAO_Message_Semantics::TAO_REPLY)); // Print out message if there is an error @@ -1341,10 +1327,10 @@ TAO_GIOP_Message_Base::send_error (TAO_Transport *transport) ACE_Data_Block data_block (TAO_GIOP_MESSAGE_HEADER_LEN, ACE_Message_Block::MB_DATA, error_message, - 0, - 0, + nullptr, + nullptr, ACE_Message_Block::DONT_DELETE, - 0); + nullptr); ACE_Message_Block message_block(&data_block, ACE_Message_Block::DONT_DELETE); message_block.wr_ptr (TAO_GIOP_MESSAGE_HEADER_LEN); @@ -1449,10 +1435,10 @@ TAO_GIOP_Message_Base:: ACE_Data_Block data_block (TAO_GIOP_MESSAGE_HEADER_LEN, ACE_Message_Block::MB_DATA, close_message, - 0, - 0, + nullptr, + nullptr, ACE_Message_Block::DONT_DELETE, - 0); + nullptr); ACE_Message_Block message_block(&data_block); message_block.wr_ptr (TAO_GIOP_MESSAGE_HEADER_LEN); @@ -1492,7 +1478,7 @@ TAO_GIOP_Message_Base::send_reply_exception ( // this). reply_params.service_context_notowned (svc_info); - if (CORBA::SystemException::_downcast (x) != 0) + if (CORBA::SystemException::_downcast (x) != nullptr) { reply_params.reply_status (GIOP::SYSTEM_EXCEPTION); } @@ -1506,7 +1492,7 @@ TAO_GIOP_Message_Base::send_reply_exception ( output.more_fragments (false); - return transport->send_message (output, 0, 0, TAO_Message_Semantics (TAO_Message_Semantics::TAO_REPLY)); + return transport->send_message (output, nullptr, nullptr, TAO_Message_Semantics (TAO_Message_Semantics::TAO_REPLY)); } void @@ -1548,7 +1534,7 @@ TAO_GIOP_Message_Base::dump_msg (const char *label, // request/reply id. CORBA::ULong tmp = 0; CORBA::ULong *id = &tmp; - char *tmp_id = 0; + char *tmp_id = nullptr; if (ptr[TAO_GIOP_MESSAGE_TYPE_OFFSET] == GIOP::Request || ptr[TAO_GIOP_MESSAGE_TYPE_OFFSET] == GIOP::Reply || @@ -1658,7 +1644,7 @@ TAO_GIOP_Message_Base::make_queued_data (size_t sz) this->orb_core_->input_cdr_msgblock_allocator (), db); - if (qd == 0) + if (qd == nullptr) { if (TAO_debug_level > 0) { @@ -1667,14 +1653,14 @@ TAO_GIOP_Message_Base::make_queued_data (size_t sz) ACE_TEXT ("out of memory, failed to allocate queued data object\n"))); } db->release (); - return 0; // NULL pointer + return nullptr; // NULL pointer } return qd; } size_t -TAO_GIOP_Message_Base::header_length (void) const +TAO_GIOP_Message_Base::header_length () const { return TAO_GIOP_MESSAGE_HEADER_LEN; } @@ -1710,7 +1696,7 @@ TAO_GIOP_Message_Base::parse_request_id (const TAO_Queued_Data *qd, // copies at all here. The same is also done in the higher layers. ACE_Message_Block::Message_Flags flg = 0; - ACE_Data_Block *db = 0; + ACE_Data_Block *db = nullptr; // Get the flag in the message block flg = qd->msg_block ()->self_flags (); @@ -1804,15 +1790,15 @@ TAO_GIOP_Message_Base::consolidate_fragmented_message ( { TAO::Incoming_Message_Stack reverse_stack; - TAO_Queued_Data *tail = 0; - TAO_Queued_Data *head = 0; + TAO_Queued_Data *tail = nullptr; + TAO_Queued_Data *head = nullptr; // // CONSOLIDATE FRAGMENTED MESSAGE // // check for error-condition - if (qd == 0) + if (qd == nullptr) { return -1; } @@ -1828,7 +1814,7 @@ TAO_GIOP_Message_Base::consolidate_fragmented_message ( { this->fragment_stack_.push (qd); - msg = 0; // no consolidated message available yet + msg = nullptr; // no consolidated message available yet return 1; // status: more messages expected. } @@ -1864,7 +1850,7 @@ TAO_GIOP_Message_Base::consolidate_fragmented_message ( head->msg_block ()->cont (tail->msg_block ()); - tail->msg_block (0); + tail->msg_block (nullptr); TAO_Queued_Data::release (tail); @@ -1905,7 +1891,7 @@ TAO_GIOP_Message_Base::consolidate_fragmented_message ( head->msg_block ()->cont (tail->msg_block ()); - tail->msg_block (0); + tail->msg_block (nullptr); TAO_Queued_Data::release (tail); @@ -1958,7 +1944,7 @@ TAO_GIOP_Message_Base::discard_fragmented_message (const TAO_Queued_Data *cancel return -1; } - TAO_Queued_Data *head = 0; + TAO_Queued_Data *head = nullptr; // Revert stack while (this->fragment_stack_.pop (head) != -1) @@ -2010,7 +1996,7 @@ TAO_GIOP_Message_Base::discard_fragmented_message (const TAO_Queued_Data *cancel } TAO_GIOP_Fragmentation_Strategy * -TAO_GIOP_Message_Base::fragmentation_strategy (void) +TAO_GIOP_Message_Base::fragmentation_strategy () { return this->fragmentation_strategy_; } diff --git a/TAO/tao/GIOP_Message_Base.h b/TAO/tao/GIOP_Message_Base.h index f726e620176..73faaaa4a49 100644 --- a/TAO/tao/GIOP_Message_Base.h +++ b/TAO/tao/GIOP_Message_Base.h @@ -54,7 +54,7 @@ public: size_t input_cdr_size = ACE_CDR::DEFAULT_BUFSIZE); /// Destructor - ~TAO_GIOP_Message_Base (void); + ~TAO_GIOP_Message_Base (); /// Initialize the underlying state object based on the @a major and /// @a minor revision numbers @@ -121,13 +121,13 @@ public: const CORBA::Exception &x); /// Header length - size_t header_length (void) const; + size_t header_length () const; /// The header length of a fragment size_t fragment_header_length ( const TAO_GIOP_Message_Version& giop_version) const; - TAO_OutputCDR &out_stream (void); + TAO_OutputCDR &out_stream (); /// Consolidate fragmented message with associated fragments, being /// stored within this class. If reliable transport is used (like @@ -149,7 +149,7 @@ public: int discard_fragmented_message (const TAO_Queued_Data *cancel_request); /// Outgoing GIOP message fragmentation strategy. - TAO_GIOP_Fragmentation_Strategy * fragmentation_strategy (void); + TAO_GIOP_Fragmentation_Strategy * fragmentation_strategy (); /// Is the messaging object ready for processing BiDirectional /// request/response? diff --git a/TAO/tao/GIOP_Message_Generator_Parser.cpp b/TAO/tao/GIOP_Message_Generator_Parser.cpp index bf339a05610..3d5efa6a49d 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser.cpp @@ -8,7 +8,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_GIOP_Message_Generator_Parser::~TAO_GIOP_Message_Generator_Parser (void) +TAO_GIOP_Message_Generator_Parser::~TAO_GIOP_Message_Generator_Parser () { } @@ -90,7 +90,7 @@ TAO_GIOP_Message_Generator_Parser::parse_locate_reply ( } bool -TAO_GIOP_Message_Generator_Parser::is_ready_for_bidirectional (void) const +TAO_GIOP_Message_Generator_Parser::is_ready_for_bidirectional () const { return false; } diff --git a/TAO/tao/GIOP_Message_Generator_Parser.h b/TAO/tao/GIOP_Message_Generator_Parser.h index 78a429daa0a..7a901a16a41 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser.h +++ b/TAO/tao/GIOP_Message_Generator_Parser.h @@ -46,7 +46,7 @@ class TAO_ServerRequest; class TAO_GIOP_Message_Generator_Parser { public: - virtual ~TAO_GIOP_Message_Generator_Parser (void); + virtual ~TAO_GIOP_Message_Generator_Parser (); /// Write the request header in to @a msg virtual bool write_request_header ( @@ -93,15 +93,15 @@ public: TAO_Pluggable_Reply_Params ¶ms); /// Our versions - virtual CORBA::Octet major_version (void) const = 0; - virtual CORBA::Octet minor_version (void) const = 0; + virtual CORBA::Octet major_version () const = 0; + virtual CORBA::Octet minor_version () const = 0; /// Is the messaging object ready for processing BiDirectional /// request/response? - virtual bool is_ready_for_bidirectional (void) const; + virtual bool is_ready_for_bidirectional () const; /// The header length of a fragment - virtual size_t fragment_header_length (void) const = 0; + virtual size_t fragment_header_length () const = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp index e9a6ca9f4bc..3775c7789be 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp @@ -456,21 +456,21 @@ TAO_GIOP_Message_Generator_Parser_10::parse_locate_reply ( } CORBA::Octet -TAO_GIOP_Message_Generator_Parser_10::major_version (void) const +TAO_GIOP_Message_Generator_Parser_10::major_version () const { // Any harm in hardcoding?? return static_cast<CORBA::Octet> (1); } CORBA::Octet -TAO_GIOP_Message_Generator_Parser_10::minor_version (void) const +TAO_GIOP_Message_Generator_Parser_10::minor_version () const { // Any harm in hardcoding?? return 0; } size_t -TAO_GIOP_Message_Generator_Parser_10::fragment_header_length (void) const +TAO_GIOP_Message_Generator_Parser_10::fragment_header_length () const { return 0; } diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.h b/TAO/tao/GIOP_Message_Generator_Parser_10.h index 936913a0b27..b4c277bb3d2 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_10.h +++ b/TAO/tao/GIOP_Message_Generator_Parser_10.h @@ -75,11 +75,11 @@ public: TAO_Pluggable_Reply_Params ¶ms); /// Our versions - virtual CORBA::Octet major_version (void) const; - virtual CORBA::Octet minor_version (void) const; + virtual CORBA::Octet major_version () const; + virtual CORBA::Octet minor_version () const; /// The header length of a fragment - virtual size_t fragment_header_length (void) const; + virtual size_t fragment_header_length () const; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GIOP_Message_Generator_Parser_11.cpp b/TAO/tao/GIOP_Message_Generator_Parser_11.cpp index 9dcc9dfe78d..9f030a51d1f 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_11.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser_11.cpp @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::Octet -TAO_GIOP_Message_Generator_Parser_11::minor_version (void) const +TAO_GIOP_Message_Generator_Parser_11::minor_version () const { return static_cast<CORBA::Octet> (1); } diff --git a/TAO/tao/GIOP_Message_Generator_Parser_11.h b/TAO/tao/GIOP_Message_Generator_Parser_11.h index 23f5c33822c..b63749b7a5d 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_11.h +++ b/TAO/tao/GIOP_Message_Generator_Parser_11.h @@ -34,7 +34,7 @@ class TAO_GIOP_Message_Generator_Parser_11 { public: /// Our minor version - virtual CORBA::Octet minor_version (void) const; + virtual CORBA::Octet minor_version () const; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp index 9b0c1a683cf..aec9acbfd60 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp @@ -380,20 +380,20 @@ TAO_GIOP_Message_Generator_Parser_12::parse_locate_reply ( CORBA::Octet -TAO_GIOP_Message_Generator_Parser_12::major_version (void) const +TAO_GIOP_Message_Generator_Parser_12::major_version () const { return static_cast<CORBA::Octet> (1); } CORBA::Octet -TAO_GIOP_Message_Generator_Parser_12::minor_version (void) const +TAO_GIOP_Message_Generator_Parser_12::minor_version () const { return static_cast<CORBA::Octet> (2); } bool -TAO_GIOP_Message_Generator_Parser_12::is_ready_for_bidirectional (void) const +TAO_GIOP_Message_Generator_Parser_12::is_ready_for_bidirectional () const { // We do support bidirectional return true; @@ -465,7 +465,7 @@ TAO_GIOP_Message_Generator_Parser_12::marshall_target_spec ( return false; // Get the IOR - IOP::IOR *ior = 0; + IOP::IOR *ior = nullptr; CORBA::ULong const index = spec.iop_ior (ior); if (ior) @@ -502,7 +502,7 @@ TAO_GIOP_Message_Generator_Parser_12::marshall_target_spec ( } size_t -TAO_GIOP_Message_Generator_Parser_12::fragment_header_length (void) const +TAO_GIOP_Message_Generator_Parser_12::fragment_header_length () const { return TAO_GIOP_MESSAGE_FRAGMENT_HEADER; } diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.h b/TAO/tao/GIOP_Message_Generator_Parser_12.h index b188879bdfb..8bfb114ce92 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_12.h +++ b/TAO/tao/GIOP_Message_Generator_Parser_12.h @@ -77,15 +77,15 @@ public: TAO_Pluggable_Reply_Params ¶ms); /// Our versions - virtual CORBA::Octet major_version (void) const; - virtual CORBA::Octet minor_version (void) const; + virtual CORBA::Octet major_version () const; + virtual CORBA::Octet minor_version () const; /// Is the messaging object ready for processing BiDirectional /// request/response? - virtual bool is_ready_for_bidirectional (void) const; + virtual bool is_ready_for_bidirectional () const; /// The header length of a fragment - virtual size_t fragment_header_length (void) const; + virtual size_t fragment_header_length () const; private: /// Marshall the TargetSpecification diff --git a/TAO/tao/GIOP_Message_State.h b/TAO/tao/GIOP_Message_State.h index 8245ff6842b..0619ff42814 100644 --- a/TAO/tao/GIOP_Message_State.h +++ b/TAO/tao/GIOP_Message_State.h @@ -39,7 +39,7 @@ class TAO_Export TAO_GIOP_Message_State { public: /// Constructor - TAO_GIOP_Message_State (void); + TAO_GIOP_Message_State (); /// Parse the message header. /// @@ -50,27 +50,27 @@ public: int parse_message_header (ACE_Message_Block &incoming); /// Return the message size - CORBA::ULong message_size (void) const; + CORBA::ULong message_size () const; /// Return the message size - CORBA::ULong payload_size (void) const; + CORBA::ULong payload_size () const; /// Return the byte order information - CORBA::Octet byte_order (void) const; + CORBA::Octet byte_order () const; /// Return the message type - GIOP::MsgType message_type (void) const; + GIOP::MsgType message_type () const; /// Return the more fragments - CORBA::Boolean more_fragments (void) const; + CORBA::Boolean more_fragments () const; void more_fragments (CORBA::Boolean fragment); /// Get the GIOP version - TAO_GIOP_Message_Version const &giop_version (void) const; + TAO_GIOP_Message_Version const &giop_version () const; /// Return the compressed information - CORBA::Boolean compressed (void) const; + CORBA::Boolean compressed () const; private: /// Parse the message header. diff --git a/TAO/tao/GIOP_Message_Version.h b/TAO/tao/GIOP_Message_Version.h index 517c40658fa..4605ad57ff4 100644 --- a/TAO/tao/GIOP_Message_Version.h +++ b/TAO/tao/GIOP_Message_Version.h @@ -41,13 +41,13 @@ public: CORBA::Octet major; /// Get major version number - CORBA::Octet major_version (void) const; + CORBA::Octet major_version () const; /// Minor version number CORBA::Octet minor; /// Get minor version number - CORBA::Octet minor_version (void) const; + CORBA::Octet minor_version () const; /// Copy constructor TAO_GIOP_Message_Version (const TAO_GIOP_Message_Version &src); diff --git a/TAO/tao/GUIResource_Factory.cpp b/TAO/tao/GUIResource_Factory.cpp index 27f7a008861..18e9854bf0d 100644 --- a/TAO/tao/GUIResource_Factory.cpp +++ b/TAO/tao/GUIResource_Factory.cpp @@ -1,22 +1,23 @@ #include "tao/GUIResource_Factory.h" #include "ace/Reactor.h" +#include "ace/Guard_T.h" #include "tao/debug.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - GUIResource_Factory::GUIResource_Factory (void) + GUIResource_Factory::GUIResource_Factory () : dynamically_allocated_reactor_ (false) { } - GUIResource_Factory::~GUIResource_Factory (void) + GUIResource_Factory::~GUIResource_Factory () { } ACE_Reactor * - GUIResource_Factory::get_reactor (void) + GUIResource_Factory::get_reactor () { // @@Marek, do we need a lock here?? // @Bala, I suppose we don't need locking for any @@ -27,17 +28,17 @@ namespace TAO // what for. Nevertheless, just for a case I sync the creation of reactor. // I think, that double checked locking is // not necessary, because the performance is not an issue here. - ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, nullptr); - ACE_Reactor *reactor = 0; + ACE_Reactor *reactor = nullptr; ACE_NEW_RETURN (reactor, ACE_Reactor (this->reactor_impl (), 1), - 0); + nullptr); if (reactor->initialized () == 0) { delete reactor; - reactor = 0; + reactor = nullptr; } else this->dynamically_allocated_reactor_ = true; diff --git a/TAO/tao/Generic_Sequence_T.h b/TAO/tao/Generic_Sequence_T.h index f34e92110e3..07a46d0d6f4 100644 --- a/TAO/tao/Generic_Sequence_T.h +++ b/TAO/tao/Generic_Sequence_T.h @@ -66,38 +66,11 @@ namespace TAO namespace details { -#if defined TAO_HAS_SEQUENCE_ITERATORS && TAO_HAS_SEQUENCE_ITERATORS == 1 - -// Forward declare the iterators -template<typename T> -class Generic_Sequence_Iterator; - -template<typename T> -class Const_Generic_Sequence_Iterator; - -template<typename T> -class Generic_Sequence_Reverse_Iterator; - -template<typename T> -class Const_Generic_Sequence_Reverse_Iterator; - -#endif /* TAO_HAS_SEQUENCE_ITERATORS==1 */ - template<typename T, class ALLOCATION_TRAITS, class ELEMENT_TRAITS> class generic_sequence { - -#if defined TAO_HAS_SEQUENCE_ITERATORS && TAO_HAS_SEQUENCE_ITERATORS == 1 - - friend class Generic_Sequence_Iterator<generic_sequence<T, ALLOCATION_TRAITS, ELEMENT_TRAITS> >; - friend class Const_Generic_Sequence_Iterator<generic_sequence<T, ALLOCATION_TRAITS, ELEMENT_TRAITS> >; - friend class Generic_Sequence_Reverse_Iterator<generic_sequence<T, ALLOCATION_TRAITS, ELEMENT_TRAITS> >; - friend class Const_Generic_Sequence_Reverse_Iterator<generic_sequence<T, ALLOCATION_TRAITS, ELEMENT_TRAITS> >; - -#endif /* TAO_HAS_SEQUENCE_ITERATORS==1 */ - public: typedef T value_type; typedef ALLOCATION_TRAITS allocation_traits; @@ -105,7 +78,7 @@ public: typedef range_checking<value_type,true> range; /// Default constructor. - generic_sequence(void) + generic_sequence() : maximum_(allocation_traits::default_maximum()) , length_(0) , buffer_(allocation_traits::default_buffer_allocation()) @@ -361,80 +334,6 @@ public: allocation_traits::freebuf(buffer); } -#if defined TAO_HAS_SEQUENCE_ITERATORS && TAO_HAS_SEQUENCE_ITERATORS == 1 - - /// - /// Additions to support iterator semantics for TAO sequences. - /// - - // = Traits and factory methods that create iterators. - typedef Generic_Sequence_Iterator<generic_sequence<T, ALLOCATION_TRAITS, ELEMENT_TRAITS> > iterator; - typedef Const_Generic_Sequence_Iterator<generic_sequence<T, ALLOCATION_TRAITS, ELEMENT_TRAITS> > const_iterator; - typedef Generic_Sequence_Reverse_Iterator<generic_sequence<T, ALLOCATION_TRAITS, ELEMENT_TRAITS> > reverse_iterator; - typedef Const_Generic_Sequence_Reverse_Iterator<generic_sequence<T, ALLOCATION_TRAITS, ELEMENT_TRAITS> > const_reverse_iterator; - - /// Get an iterator that points to the beginning of the sequence. - iterator begin (void) - { - return typename generic_sequence<T, ALLOCATION_TRAITS, ELEMENT_TRAITS>::iterator (this); - } - - /// Get a const iterator that points to the beginning of the sequence. - const_iterator begin (void) const - { - return typename generic_sequence<T, ALLOCATION_TRAITS, ELEMENT_TRAITS>::const_iterator (this); - } - - /// Get an iterator that points to the end of the sequence. - iterator end (void) - { - return typename generic_sequence<T, ALLOCATION_TRAITS, ELEMENT_TRAITS>::iterator (this, - this->length_); - } - - /// Get a const iterator that points to the end of the sequence. - const_iterator end (void) const - { - return typename generic_sequence<T, ALLOCATION_TRAITS, ELEMENT_TRAITS>::const_iterator (this, - this->length_); - } - - // Get a reverse iterator that points to the end of the sequence. - reverse_iterator rbegin (void) - { - // Here we need to be at the last element - not one past. - return typename generic_sequence<T, ALLOCATION_TRAITS, ELEMENT_TRAITS>::reverse_iterator (this, - this->length_ - 1); - } - - // Get a const reverse iterator that points to the end of the sequence. - const_reverse_iterator rbegin (void) const - { - // Here we need to be at the last element - not one past. - return typename generic_sequence<T, ALLOCATION_TRAITS, ELEMENT_TRAITS>::const_reverse_iterator (this, - this->length_ - 1); - } - - // Get a reverse iterator that points to one before the - // beginning of the sequence. - reverse_iterator rend (void) - { - // Here we need to be at one before the first element - not the first. - return typename generic_sequence<T, ALLOCATION_TRAITS, ELEMENT_TRAITS>::reverse_iterator (this, - -1); - } - - // Get a const reverse iterator that points to one before the - // beginning of the sequence. - const_reverse_iterator rend (void) const - { - // Here we need to be at one before the first element - not the first. - return typename generic_sequence<T, ALLOCATION_TRAITS, ELEMENT_TRAITS>::const_reverse_iterator (this, - -1); - } - -#endif /* TAO_HAS_SEQUENCE_ITERATORS==1 */ - private: /// The maximum number of elements the buffer can contain. CORBA::ULong maximum_; @@ -446,891 +345,6 @@ private: /// destroyed. mutable CORBA::Boolean release_; }; - -#if defined TAO_HAS_SEQUENCE_ITERATORS && TAO_HAS_SEQUENCE_ITERATORS == 1 - -/** - * @class Generic_Sequence_Iterator - * @brief Implements a random access iterator for generic sequence type - * classes. - */ -template <typename SEQUENCE_T> - class Generic_Sequence_Iterator -{ - friend class Const_Generic_Sequence_Iterator<SEQUENCE_T>; - -public: - // = Necessary traits - typedef std::random_access_iterator_tag iterator_category; - typedef typename SEQUENCE_T::value_type value_type; - typedef typename SEQUENCE_T::value_type *pointer; - typedef typename SEQUENCE_T::value_type &reference; - typedef typename SEQUENCE_T::allocation_traits allocation_traits; - typedef typename SEQUENCE_T::element_traits element_traits; - typedef CORBA::Long difference_type; - - /// Construct a Generic_Sequence_Iterator at position pos. - Generic_Sequence_Iterator (generic_sequence<value_type, - allocation_traits, - element_traits> *sequence, - size_t pos = 0) - : sequence_ (sequence), - pos_ (pos) - { - } - - /// Copy constructor - Generic_Sequence_Iterator (Generic_Sequence_Iterator<SEQUENCE_T> const & rhs) - : sequence_ (rhs.sequence_), - pos_ (rhs.pos_) - { - } - - /// Assignment operator - Generic_Sequence_Iterator & operator= ( - Generic_Sequence_Iterator<SEQUENCE_T> const & rhs) - { - Generic_Sequence_Iterator tmp(rhs); - swap (tmp); - return * this; - } - - /// swaps all members - void swap(Generic_Sequence_Iterator<SEQUENCE_T> & rhs) - throw() - { - std::swap (sequence_, rhs.sequence_); - std::swap (this->pos_, rhs.pos_); - } - - /// typecast operator to Const_Generic_Sequence_Iterator - operator Const_Generic_Sequence_Iterator<SEQUENCE_T> () - { - return Const_Generic_Sequence_Iterator<SEQUENCE_T> (*this); - } - - /// Dereference operator returns a reference to the item contained - /// at the current position - value_type & operator* (void) - { - // Access the underlying element in the sequence. - return (*(this->sequence_))[this->pos_]; - } - - /// Returns a const reference to the item contained at the current position - const value_type & operator* (void) const - { - // Access the underlying element in the sequence. - return (*(this->sequence_))[this->pos_]; - } - - /// Preincrement operator - Generic_Sequence_Iterator<SEQUENCE_T> &operator++ (void) - { - // Increment the position. - // We also need to check if we're now past the end. - ++this->pos_; - return *this; - } - - /// Postincrement operator - Generic_Sequence_Iterator<SEQUENCE_T> operator++ (int) - { - // Create a temporary to return so that it's not modified. - Generic_Sequence_Iterator<SEQUENCE_T> temp_iter (this->sequence_, this->pos_); - // Increment the position. - // We also need to check if we're now past the end. - ++this->pos_; - return temp_iter; - } - - /// Predecrement operator - Generic_Sequence_Iterator<SEQUENCE_T> &operator-- (void) - { - --this->pos_; - return *this; - } - - /// Postdecrement operator - Generic_Sequence_Iterator<SEQUENCE_T> operator-- (int) - { - // Create a temporary to return so that it's not modified. - Generic_Sequence_Iterator<SEQUENCE_T> temp_iter (this->sequence_, this->pos_); - --this->pos_; - return temp_iter; - } - - /// Iterator addition - Generic_Sequence_Iterator<SEQUENCE_T> &operator+= (difference_type n) - { - // Move ahead n elements. - this->pos_ += n; - return *this; - } - - /// Iterator addition - Generic_Sequence_Iterator<SEQUENCE_T> operator+ (difference_type n) - { - // Create a temporary to return and move it ahead n elements. - return Generic_Sequence_Iterator<SEQUENCE_T> (this->sequence_, this->pos_ + n); - } - - /// Iterator subtraction - Generic_Sequence_Iterator<SEQUENCE_T> &operator-= (difference_type n) - { - // Move back n elements. - this->pos_ -= n; - return *this; - } - - /// Iterator subtraction - Generic_Sequence_Iterator<SEQUENCE_T> operator- (difference_type n) - { - // Create a temporary to return and move it back n elements. - return Generic_Sequence_Iterator<SEQUENCE_T> (this->sequence_, this->pos_ - n); - } - - /// Difference - difference_type operator- (const Generic_Sequence_Iterator<SEQUENCE_T> & rhs) - { - // I think order is important here (i.e., rhs before this). - return this->pos_ - rhs.pos_; - } - - /// Difference - difference_type operator- (const Const_Generic_Sequence_Iterator<SEQUENCE_T> & rhs) - { - // I think order is important here (i.e., rhs before this). - return this->pos_ - rhs.pos_; - } - - - /// Element operator/assignment - value_type & operator[] (difference_type n) - { - // Return the element at position n - return (*(this->sequence_))[this->pos_ + n]; - } - - /// Less than - bool operator< (const Generic_Sequence_Iterator<SEQUENCE_T> & rhs) - { - // Return if this iterator is less than the passed in iterator. - return this->pos_ < rhs.pos_; - } - - /// Less than - bool operator< (const Const_Generic_Sequence_Iterator<SEQUENCE_T> & rhs) - { - // Return if this iterator is less than the passed in iterator. - return this->pos_ < rhs.pos_; - } - - - /// Equality operator - bool operator== (const Generic_Sequence_Iterator<SEQUENCE_T> &rhs) const - { - // Compare all the data members for equality. - return this->sequence_ == rhs.sequence_ - && this->pos_ == rhs.pos_; - } - - /// Nonequality operator - bool operator!= (const Generic_Sequence_Iterator<SEQUENCE_T> &rhs) const - { - return !(*this == rhs); - } - -private: - /// the sequence with which we are dealing - generic_sequence<value_type, allocation_traits, element_traits> *sequence_; - - /// Our current position in the sequence. - mutable difference_type pos_; -}; - - -/// Iterator addition with the difference_type being the first argument. -template<typename SEQUENCE_T> - Generic_Sequence_Iterator<SEQUENCE_T> - operator+ (typename Generic_Sequence_Iterator<SEQUENCE_T>::difference_type n, - const Generic_Sequence_Iterator<SEQUENCE_T> & iter) - { - // Create an iter and move it ahead n elements. - return Generic_Sequence_Iterator<SEQUENCE_T> (iter.sequence_, iter.pos_ + n); - } - -/// Iterator subtraction with the difference_type being the first argument. -template<typename SEQUENCE_T> - Generic_Sequence_Iterator<SEQUENCE_T> operator- - (typename Generic_Sequence_Iterator<SEQUENCE_T>::difference_type n, - Generic_Sequence_Iterator<SEQUENCE_T> iter) - { - // Create an iter and move it back n elements. - return Generic_Sequence_Iterator<SEQUENCE_T> (iter.sequence_, iter.pos_ - n); - } - - -/** - * @class Const_Generic_Sequence_Iterator - * @brief Implements a constant random access iterator for generic sequence - * type classes. - * - * Note: Having a const Iterator does not guarantee that the current - * *position* that it points to will not change, it only guarantees that - * you cannot change the underlying array! - */ -template <typename SEQUENCE_T> -class Const_Generic_Sequence_Iterator -{ - friend class Generic_Sequence_Iterator<SEQUENCE_T>; - -public: - // = Necessary traits - typedef std::random_access_iterator_tag iterator_category; - typedef typename SEQUENCE_T::value_type value_type; - typedef typename SEQUENCE_T::value_type *pointer; - typedef typename SEQUENCE_T::value_type &reference; - typedef typename SEQUENCE_T::allocation_traits allocation_traits; - typedef typename SEQUENCE_T::element_traits element_traits; - typedef int difference_type; - - /// Construct a Const_Generic_Sequence_Iterator at position pos from - /// a const sequence. - Const_Generic_Sequence_Iterator (const generic_sequence<value_type, - allocation_traits, - element_traits> *sequence, - size_t pos = 0) - : sequence_ (sequence), - pos_ (pos) - { - } - - virtual ~Const_Generic_Sequence_Iterator () - { - } - - /// Copy constructor - Const_Generic_Sequence_Iterator ( - Const_Generic_Sequence_Iterator<SEQUENCE_T> const & rhs) - : sequence_ (rhs.sequence_), - pos_ (rhs.pos_) - { - } - - /// Copy constructor initializing by a Generic_Sequence_Iterator - explicit Const_Generic_Sequence_Iterator ( - Generic_Sequence_Iterator<SEQUENCE_T> const & rhs) - : sequence_ (rhs.sequence_), - pos_ (rhs.pos_) - { - } - - /// Assignment operator - Const_Generic_Sequence_Iterator & operator= ( - Const_Generic_Sequence_Iterator<SEQUENCE_T> const & rhs) - { - Const_Generic_Sequence_Iterator tmp(rhs); - swap (tmp); - return * this; - } - - /// swaps all members - void swap(Const_Generic_Sequence_Iterator<SEQUENCE_T> & rhs) - throw() - { - std::swap (sequence_, rhs.sequence_); - std::swap (this->pos_, rhs.pos_); - } - - /// Dereference operator returns a reference to the item contained - /// at the current position - const value_type & operator* (void) const - { - // Access the underlying element in the sequence. - return (*(this->sequence_))[this->pos_]; - } - - /// Preincrement operator - const Const_Generic_Sequence_Iterator<SEQUENCE_T> &operator++ (void) const - { - // Increment the position. - // We also need to check if we're now past the end. - ++this->pos_; - return * this; - } - - /// Postincrement operator - Const_Generic_Sequence_Iterator<SEQUENCE_T> operator++ (int) const - { - // Create a temporary to return so that it's not modified. - Const_Generic_Sequence_Iterator<SEQUENCE_T> temp_iter (this->sequence_, this->pos_); - // Increment the position. - // We also need to check if we're now past the end. - ++this->pos_; - return temp_iter; - } - - /// Predecrement operator - const Const_Generic_Sequence_Iterator<SEQUENCE_T> &operator-- (void) const - { - --this->pos_; - return * this; - } - - /// Postdecrement operator - Const_Generic_Sequence_Iterator<SEQUENCE_T> operator-- (int) const - { - // Create a temporary to return so that it's not modified. - Const_Generic_Sequence_Iterator<SEQUENCE_T> temp_iter (this->sequence_, this->pos_); - --this->pos_; - return temp_iter; - } - - /// Iterator addition - const Const_Generic_Sequence_Iterator<SEQUENCE_T> &operator+= (difference_type n) const - { - // Move ahead n elements. - this->pos_ += n; - return * this; - } - - /// Iterator addition - Const_Generic_Sequence_Iterator<SEQUENCE_T> operator+ (difference_type n) const - { - // Create a temporary to return and move it ahead n elements. - return Const_Generic_Sequence_Iterator<SEQUENCE_T> (this->sequence_, this->pos_ + n); - } - - /// Iterator subtraction - const Const_Generic_Sequence_Iterator<SEQUENCE_T> &operator-= (difference_type n) const - { - // Move back n elements. - this->pos_ -= n; - return * this; - } - - /// Iterator subtraction - Const_Generic_Sequence_Iterator<SEQUENCE_T> operator- (difference_type n) const - { - // Create a temporary to return and move it back n elements. - return Const_Generic_Sequence_Iterator<SEQUENCE_T> (this->sequence_, this->pos_ - n); - } - - /// Difference - difference_type operator- (const Const_Generic_Sequence_Iterator<SEQUENCE_T> & rhs) const - { - // I think the order is important here (i.e., rhs before this). - return this->pos_ - rhs.pos_; - } - - /// Element operator/assignment - const value_type & operator[] (difference_type n) const - { - // Return the element at position n - return (*(this->sequence_))[this->pos_ + n]; - } - - /// Less than - virtual bool operator< (const Const_Generic_Sequence_Iterator<SEQUENCE_T> & rhs) const - { - // Return if this iterator is less than the passed in iterator. - return this->pos_ < rhs.pos_; - } - - /// Equality operator - bool operator== (const Const_Generic_Sequence_Iterator<SEQUENCE_T> &rhs) const - { - // Compare all the data members for equality. - return this->sequence_ == rhs.sequence_ - && this->pos_ == rhs.pos_; - } - - /// Nonequality operator - bool operator!= (const Const_Generic_Sequence_Iterator<SEQUENCE_T> &rhs) const - { - return !(*this == rhs); - } - -private: - /// the array we are dealing with - const generic_sequence<value_type, allocation_traits, element_traits> *sequence_; - - /// Our current position in the sequence. - mutable difference_type pos_; -}; - -/// Iterator addition with the difference_type being the first argument. -template<typename SEQUENCE_T> - Const_Generic_Sequence_Iterator<SEQUENCE_T> operator+ - (typename Generic_Sequence_Iterator<SEQUENCE_T>::difference_type n, - Const_Generic_Sequence_Iterator<SEQUENCE_T> iter) - { - // Create an iter and move it ahead n elements. - return Const_Generic_Sequence_Iterator<SEQUENCE_T> (iter.sequence_, iter.pos_ + n); - } - -/// Iterator subtraction with the difference_type being the first argument. -template<typename SEQUENCE_T> - Const_Generic_Sequence_Iterator<SEQUENCE_T> operator- - (typename Generic_Sequence_Iterator<SEQUENCE_T>::difference_type n, - Const_Generic_Sequence_Iterator<SEQUENCE_T> iter) - { - // Create an iter and move it back n elements. - return Const_Generic_Sequence_Iterator<SEQUENCE_T> (iter.sequence_, iter.pos_ - n); - } - - -/** - * @class Generic_Sequence_Reverse_Iterator - * @brief Implements a reverse random access iterator for generic sequence - * type classes. - */ -template <typename SEQUENCE_T> -class Generic_Sequence_Reverse_Iterator -{ - friend class Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T>; - -public: - // = Necessary traits - typedef std::random_access_iterator_tag iterator_category; - typedef typename SEQUENCE_T::value_type value_type; - typedef typename SEQUENCE_T::value_type *pointer; - typedef typename SEQUENCE_T::value_type &reference; - typedef typename SEQUENCE_T::allocation_traits allocation_traits; - typedef typename SEQUENCE_T::element_traits element_traits; - typedef int difference_type; - - /// Construct a Generic_Sequence_Reverse_Iterator at position pos with before_start flag. - Generic_Sequence_Reverse_Iterator (generic_sequence<value_type, - allocation_traits, - element_traits> *sequence, - size_t pos) - : sequence_ (sequence), - pos_ (pos) - { - } - - /// Copy constructor - Generic_Sequence_Reverse_Iterator ( - Generic_Sequence_Reverse_Iterator<SEQUENCE_T> const & rhs) - : sequence_ (rhs.sequence_), - pos_ (rhs.pos_) - { - } - - /// Assignment operator - Generic_Sequence_Reverse_Iterator & operator= ( - Generic_Sequence_Reverse_Iterator<SEQUENCE_T> const & rhs) - { - Generic_Sequence_Reverse_Iterator tmp(rhs); - swap (tmp); - return * this; - } - - /// swaps all members - void swap(Generic_Sequence_Reverse_Iterator<SEQUENCE_T> & rhs) - throw() - { - std::swap (sequence_, rhs.sequence_); - std::swap (this->pos_, rhs.pos_); - } - - /// Dereference operator returns a reference to the item contained - /// at the current position - value_type & operator* (void) - { - // Access the underlying element in the sequence. - return (*(this->sequence_))[this->pos_]; - } - - /// Returns a const reference to the item contained at the current position - const value_type& operator* (void) const - { - // Access the underlying element in the sequence. - return (*(this->sequence_))[this->pos_]; - } - - /// Preincrement operator - Generic_Sequence_Reverse_Iterator<SEQUENCE_T> &operator++ (void) - { - // Decrement the position for reverse iterators. - // We also need to check if we're now before the start. - --this->pos_; - return *this; - } - - /// Postincrement operator - Generic_Sequence_Reverse_Iterator<SEQUENCE_T> operator++ (int) - { - // Create a temporary to return so that it's not modified. - Generic_Sequence_Reverse_Iterator<SEQUENCE_T> temp_iter (this->sequence_, this->pos_); - // Decrement the position for reverse iterators. - // We also need to check if we're now past the end. - --this->pos_; - return temp_iter; - } - - /// Predecrement operator - Generic_Sequence_Reverse_Iterator<SEQUENCE_T> &operator-- (void) - { - // Increment the position for reverse iterators. - ++this->pos_; - return *this; - } - - /// Postdecrement operator - Generic_Sequence_Reverse_Iterator<SEQUENCE_T> operator-- (int) - { - // Create a temporary to return so that it's not modified. - Generic_Sequence_Reverse_Iterator<SEQUENCE_T> temp_iter (this->sequence_, this->pos_); - // Increment the position for reverse iterators. - ++this->pos_; - return temp_iter; - } - - /// Iterator addition - Generic_Sequence_Reverse_Iterator<SEQUENCE_T> &operator+= (difference_type n) - { - // Move back n elements for reverse iterators. - this->pos_ -= n; - return *this; - } - - /// Iterator addition - Generic_Sequence_Reverse_Iterator<SEQUENCE_T> operator+ (difference_type n) - { - // Create a temporary to return and move it back n elements for - // reverse iterators. - return Generic_Sequence_Reverse_Iterator<SEQUENCE_T> (this->sequence_, this->pos_ - n); - } - - /// Iterator subtraction - Generic_Sequence_Reverse_Iterator<SEQUENCE_T> &operator-= (difference_type n) - { - // Move ahead n elements for reverse iterators. - this->pos_ += n; - return *this; - } - - /// Iterator subtraction - Generic_Sequence_Reverse_Iterator<SEQUENCE_T> operator- (difference_type n) - { - // Create a temporary to return and move it ahead n elements for - // reverse iterators. - return Generic_Sequence_Reverse_Iterator<SEQUENCE_T> (this->sequence_, this->pos_ + n); - } - - /// Difference - difference_type operator- (const Generic_Sequence_Reverse_Iterator<SEQUENCE_T> & rhs) - { - // I think order is important here (i.e., rhs before this). - return rhs.pos_ - this->pos_; - } - - /// Difference - difference_type operator- (const Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> & rhs) - { - // I think order is important here (i.e., rhs before this). - return rhs.pos_ - this->pos_; - } - - - /// Element operator/assignment - value_type & operator[] (difference_type n) - { - // Return the element at position n - return (*(this->sequence_))[this->pos_ - n]; - } - - /// Less than - bool operator< (const Generic_Sequence_Reverse_Iterator<SEQUENCE_T> & rhs) - { - // Return if this iterator is less than the passed in iterator. - // For reverse iterators reverse the logic. - return this->pos_ > rhs.pos_; - } - - /// Less than - bool operator< (const Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> & rhs) - { - // Return if this iterator is less than the passed in iterator. - // For reverse iterators reverse the logic. - return this->pos_ > rhs.pos_; - } - - - /// Equality operator - bool operator== (const Generic_Sequence_Reverse_Iterator<SEQUENCE_T> &rhs) const - { - // Compare all the data members for equality. - return this->sequence_ == rhs.sequence_ - && this->pos_ == rhs.pos_; - } - - /// Equality operator - bool operator== (const Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> &rhs) const - { - // Compare all the data members for equality. - return this->sequence_ == rhs.sequence_ - && this->pos_ == rhs.pos_; - } - - /// Nonequality operator - bool operator!= (const Generic_Sequence_Reverse_Iterator<SEQUENCE_T> &rhs) const - { - return !(*this == rhs); - } - - /// Nonequality operator - bool operator!= (const Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> &rhs) const - { - return !(*this == rhs); - } - -private: - /// The sequence with which we are dealing - generic_sequence<value_type, allocation_traits, element_traits> *sequence_; - - /// Our current position in the sequence. - mutable difference_type pos_; -}; - -/// Iterator addition with the difference_type being the first argument. -template<typename SEQUENCE_T> - Generic_Sequence_Reverse_Iterator<SEQUENCE_T> operator+ - (typename Generic_Sequence_Reverse_Iterator<SEQUENCE_T>::difference_type n, - Generic_Sequence_Reverse_Iterator<SEQUENCE_T> iter) - { - // Create an iter and move it back n elements for reverse iterators. - return Generic_Sequence_Reverse_Iterator<SEQUENCE_T> (iter.sequence_, iter.pos_ - n); - } - -/// Iterator subtraction with the difference_type being the first argument. -template<typename SEQUENCE_T> - Generic_Sequence_Reverse_Iterator<SEQUENCE_T> operator- - (typename Generic_Sequence_Reverse_Iterator<SEQUENCE_T>::difference_type n, - Generic_Sequence_Reverse_Iterator<SEQUENCE_T> iter) - { - // Create an iter and move it ahead n elements for reverse iterators. - return Generic_Sequence_Reverse_Iterator<SEQUENCE_T> (iter.sequence_, iter.pos_ + n); - } - - -/** - * @class Const_Generic_Sequence_Reverse_Iterator - * @brief Implements a constant reverse random access iterator for generic - * sequence type classes. - * - * Note: Having a const Iterator does not guarantee that the current - * *position* that it points to will not change, it only guarantees that - * you cannot change the underlying array! - */ -template <typename SEQUENCE_T> -class Const_Generic_Sequence_Reverse_Iterator -{ - friend class Generic_Sequence_Reverse_Iterator<SEQUENCE_T>; - -public: - // = Necessary traits - typedef std::random_access_iterator_tag iterator_category; - typedef typename SEQUENCE_T::value_type value_type; - typedef typename SEQUENCE_T::value_type *pointer; - typedef typename SEQUENCE_T::value_type &reference; - typedef typename SEQUENCE_T::allocation_traits allocation_traits; - typedef typename SEQUENCE_T::element_traits element_traits; - typedef int difference_type; - - /// Construct a Const_Generic_Sequence_Reverse_Iterator at position pos - /// using a const sequence. - Const_Generic_Sequence_Reverse_Iterator (const generic_sequence<value_type, - allocation_traits, - element_traits> *sequence, - size_t pos) - : sequence_ (sequence), - pos_ (pos) - { - } - - /// Copy constructor - Const_Generic_Sequence_Reverse_Iterator ( - Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> const & rhs) - : sequence_ (rhs.sequence_), - pos_ (rhs.pos_) - { - } - - /// Copy constructor - Const_Generic_Sequence_Reverse_Iterator ( - Generic_Sequence_Reverse_Iterator<SEQUENCE_T> const & rhs) - : sequence_ (rhs.sequence_), - pos_ (rhs.pos_) - { - } - - /// Assignment operator - Const_Generic_Sequence_Reverse_Iterator & operator= ( - Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> const & rhs) - { - Const_Generic_Sequence_Reverse_Iterator tmp(rhs); - swap (tmp); - return * this; - } - - /// swaps all members - void swap(Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> & rhs) - throw() - { - std::swap (sequence_, rhs.sequence_); - std::swap (this->pos_, rhs.pos_); - } - - /// typecast operator to Generic_Sequence_Reverse_Iterator - - /// Dereference operator returns a reference to the item contained - /// at the current position - const value_type& operator* (void) const - { - // Access the underlying element in the sequence. - return (*this->sequence_)[this->pos_]; - } - - /// Preincrement operator - const Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> &operator++ (void) const - { - // Decrement the position for reveres iterators. - // We also need to check if we're now before the start. - --this->pos_; - return *this; - } - - /// Postincrement operator - Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> operator++ (int) const - { - // Create a temporary to return so that it's not modified. - Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> temp_iter (this->sequence_, this->pos_); - // Decrement the position for reverse iterators. - // We also need to check if we're now before the start. - --this->pos_; - return temp_iter; - } - - /// Predecrement operator - const Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> &operator-- (void) const - { - // Increment the position for reverse iterators. - ++this->pos_; - return *this; - } - - /// Postdecrement operator - Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> operator-- (int) const - { - // Create a temporary to return so that it's not modified. - Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> temp_iter (this->sequence_, this->pos_); - // Increment the position for reverse iterators. - ++this->pos_; - return temp_iter; - } - - /// Iterator addition - const Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> &operator+= (difference_type n) const - { - // Move back n elements for reverse iterators. - this->pos_ -= n; - return *this; - } - - /// Iterator addition - Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> operator+ (difference_type n) const - { - // Create a temporary to return and move it back n elements for - // reverse iterators. - return Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> (this->sequence_, this->pos_ - n); - } - - /// Iterator subtraction - const Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> &operator-= (difference_type n) const - { - // Move ahead n elements for reverse iterators. - this->pos_ += n; - return *this; - } - - /// Iterator subtraction - Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> operator- (difference_type n) const - { - // Create a temporary to return and move it ahead n elements for - // reverse iterators. - return Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> (this->sequence_, this->pos_ + n); - } - - /// Difference - difference_type operator- (const Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> & rhs) const - { - // I think order is important here (i.e., rhs before this). - return rhs.pos_ - this->pos_; - } - - /// Element operator/assignment - const value_type & operator[] (difference_type n) const - { - // Return the element at position n - return (*(this->sequence_))[this->pos_ - n]; - } - - /// Less than - bool operator< (const Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> & rhs) const - { - // Return if this iterator is less than the passed in iterator. - // For reverse iterators reverse the logic. - return this->pos_ > rhs.pos_; - } - - /// Equality operator - bool operator== (const Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> &rhs) const - { - // Compare all the data members for equality. - return this->sequence_ == rhs.sequence_ - && this->pos_ == rhs.pos_; - } - - /// Nonequality operator - bool operator!= (const Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> &rhs) const - { - return !(*this == rhs); - } - -private: - /// the array we are dealing with - const generic_sequence<value_type, allocation_traits, element_traits> *sequence_; - - /// Our current position in the sequence. - mutable difference_type pos_; -}; - -/// Iterator addition with the difference_type being the first argument. -template<typename SEQUENCE_T> - Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> operator+ - (typename Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T>::difference_type n, - Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> iter) - { - // Create an iter and move it back n elements for reverse iterators. - return Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> (iter.sequence_, iter.pos_ - n); - } - -/// Iterator subtraction with the difference_type being the first argument. -template<typename SEQUENCE_T> - Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> operator- - (typename Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T>::difference_type n, - Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> iter) - { - // Create an iter and move it ahead n elements for reverse iterators. - return Const_Generic_Sequence_Reverse_Iterator<SEQUENCE_T> (iter.sequence_, iter.pos_ + n); - } - -#endif /* TAO_HAS_SEQUENCE_ITERATORS==1 */ - } // namespace details } // namespace TAO diff --git a/TAO/tao/HR_Time_Policy_Strategy.cpp b/TAO/tao/HR_Time_Policy_Strategy.cpp index 33cd3180412..6cd1a821445 100644 --- a/TAO/tao/HR_Time_Policy_Strategy.cpp +++ b/TAO/tao/HR_Time_Policy_Strategy.cpp @@ -13,15 +13,15 @@ TAO_HR_Time_Policy_Strategy::~TAO_HR_Time_Policy_Strategy () { } -ACE_Timer_Queue * TAO_HR_Time_Policy_Strategy::create_timer_queue (void) +ACE_Timer_Queue * TAO_HR_Time_Policy_Strategy::create_timer_queue () { - ACE_Timer_Queue * tmq = 0; + ACE_Timer_Queue * tmq = nullptr; typedef ACE_Timer_Heap_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall, ACE_SYNCH_RECURSIVE_MUTEX, ACE_HR_Time_Policy> timer_queue_type; - ACE_NEW_RETURN (tmq, timer_queue_type (), 0); + ACE_NEW_RETURN (tmq, timer_queue_type (), nullptr); return tmq; } @@ -32,7 +32,7 @@ TAO_HR_Time_Policy_Strategy::destroy_timer_queue (ACE_Timer_Queue *tmq) delete tmq; } -ACE_Dynamic_Time_Policy_Base * TAO_HR_Time_Policy_Strategy::get_time_policy (void) +ACE_Dynamic_Time_Policy_Base * TAO_HR_Time_Policy_Strategy::get_time_policy () { return &time_policy_; } diff --git a/TAO/tao/HTTP_Client.cpp b/TAO/tao/HTTP_Client.cpp index f4ddaa6678d..80938aac971 100644 --- a/TAO/tao/HTTP_Client.cpp +++ b/TAO/tao/HTTP_Client.cpp @@ -9,12 +9,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_HTTP_Client::TAO_HTTP_Client (void) - : filename_ (0) +TAO_HTTP_Client::TAO_HTTP_Client () + : filename_ (nullptr) { } -TAO_HTTP_Client::~TAO_HTTP_Client (void) +TAO_HTTP_Client::~TAO_HTTP_Client () { this->close (); } @@ -47,12 +47,12 @@ TAO_HTTP_Client::read (ACE_Message_Block *mb) } int -TAO_HTTP_Client::close (void) +TAO_HTTP_Client::close () { if (this->filename_) { ACE_OS::free ((void *) this->filename_); - this->filename_ = 0; + this->filename_ = nullptr; } return 0; } diff --git a/TAO/tao/HTTP_Handler.cpp b/TAO/tao/HTTP_Handler.cpp index c645b03007a..5c70d7425b9 100644 --- a/TAO/tao/HTTP_Handler.cpp +++ b/TAO/tao/HTTP_Handler.cpp @@ -9,9 +9,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_HTTP_Handler::TAO_HTTP_Handler (void) : - mb_ (0), - filename_ (0), +TAO_HTTP_Handler::TAO_HTTP_Handler () : + mb_ (nullptr), + filename_ (nullptr), bytecount_ (0) { } @@ -24,12 +24,12 @@ TAO_HTTP_Handler::TAO_HTTP_Handler (ACE_Message_Block * mb, { } -TAO_HTTP_Handler::~TAO_HTTP_Handler (void) +TAO_HTTP_Handler::~TAO_HTTP_Handler () { if (this->filename_) { ACE_OS::free (this->filename_); - filename_ = 0; + filename_ = nullptr; } } @@ -52,19 +52,19 @@ TAO_HTTP_Handler::close (u_long) } int -TAO_HTTP_Handler::send_request (void) +TAO_HTTP_Handler::send_request () { return -1; } int -TAO_HTTP_Handler::receive_reply (void) +TAO_HTTP_Handler::receive_reply () { return -1; } size_t -TAO_HTTP_Handler::byte_count (void) const +TAO_HTTP_Handler::byte_count () const { return bytecount_; } @@ -82,7 +82,7 @@ TAO_HTTP_Reader::TAO_HTTP_Reader (ACE_Message_Block * mb, } int -TAO_HTTP_Reader::send_request (void) +TAO_HTTP_Reader::send_request () { char mesg [MAX_HEADER_SIZE]; @@ -105,27 +105,27 @@ TAO_HTTP_Reader::send_request (void) } int -TAO_HTTP_Reader::receive_reply (void) +TAO_HTTP_Reader::receive_reply () { size_t num_recvd = 0; char buf [MTU+1]; - char *buf_ptr = 0; + char *buf_ptr = nullptr; size_t bytes_read = 0; // Receive the first MTU bytes and strip the header off. // Note that we assume that the header will fit into MTU bytes. - if (peer ().recv_n (buf, MTU, 0, &num_recvd) >= 0) + if (peer ().recv_n (buf, MTU, nullptr, &num_recvd) >= 0) { //Make sure that response type is 200 OK - if (ACE_OS::strstr (buf,"200 OK") == 0) + if (ACE_OS::strstr (buf,"200 OK") == nullptr) TAOLIB_ERROR_RETURN ((LM_ERROR, "TAO (%P|%t) - HTTP_Reader::receive_reply, Response is not 200 OK\n" ), -1); // Search for the header termination string "\r\n\r\n", or "\n\n". If // found, move past it to get to the data portion. - if ((buf_ptr = ACE_OS::strstr (buf,"\r\n\r\n")) != 0) + if ((buf_ptr = ACE_OS::strstr (buf,"\r\n\r\n")) != nullptr) buf_ptr += 4; - else if ((buf_ptr = ACE_OS::strstr (buf, "\n\n")) != 0) //for compatibility with JAWS + else if ((buf_ptr = ACE_OS::strstr (buf, "\n\n")) != nullptr) //for compatibility with JAWS buf_ptr += 2; else buf_ptr = buf; @@ -145,7 +145,7 @@ TAO_HTTP_Reader::receive_reply (void) // At this point, we have stripped off the header and are ready to // process data. buf_ptr points to the data - ACE_Message_Block* temp = 0; + ACE_Message_Block* temp = nullptr; ACE_Message_Block* curr = this->mb_; ACE_NEW_RETURN (temp, @@ -175,7 +175,7 @@ TAO_HTTP_Reader::receive_reply (void) curr = curr->cont (); } - if (peer ().recv_n (curr->wr_ptr (), curr->space (), 0, &num_recvd) >= 0) + if (peer ().recv_n (curr->wr_ptr (), curr->space (), nullptr, &num_recvd) >= 0) { // Move the write pointer curr->wr_ptr (num_recvd); diff --git a/TAO/tao/HTTP_Parser.cpp b/TAO/tao/HTTP_Parser.cpp index 7090dea4d03..e4922fb4a7d 100644 --- a/TAO/tao/HTTP_Parser.cpp +++ b/TAO/tao/HTTP_Parser.cpp @@ -18,7 +18,7 @@ static const ACE_TCHAR file_prefix[] = ACE_TEXT ("http:"); TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_HTTP_Parser::~TAO_HTTP_Parser (void) +TAO_HTTP_Parser::~TAO_HTTP_Parser () { } @@ -42,9 +42,9 @@ TAO_HTTP_Parser::parse_string (const char *nior, const ACE_TCHAR *http_url = ior.c_str () + sizeof (::file_prefix) + 1; - ACE_TCHAR *hostname = 0; - ACE_TCHAR *filename = 0; - const ACE_TCHAR *ptr = 0; + ACE_TCHAR *hostname = nullptr; + ACE_TCHAR *filename = nullptr; + const ACE_TCHAR *ptr = nullptr; u_short port = 80; if (http_url[0] == '/') @@ -60,11 +60,11 @@ TAO_HTTP_Parser::parse_string (const char *nior, ptr = ACE_OS::strstr (http_url, ACE_TEXT ("/")); if(!ptr) - return 0; + return nullptr; else { size_t const host_len = ptr - http_url; - ACE_NEW_RETURN (hostname, ACE_TCHAR [host_len + 1], 0 ); + ACE_NEW_RETURN (hostname, ACE_TCHAR [host_len + 1], nullptr ); ACE_OS::strncpy (hostname, http_url, host_len); hostname [host_len] = '\0'; ptr = ACE_OS::strstr (ptr, ACE_TEXT ("/")); @@ -75,12 +75,12 @@ TAO_HTTP_Parser::parse_string (const char *nior, else { delete [] hostname; - return 0; + return nullptr; } } } - ACE_Message_Block* mb = 0; + ACE_Message_Block* mb = nullptr; ACE_NEW_THROW_EX (mb, ACE_Message_Block (), CORBA::INTERNAL ()); @@ -101,7 +101,7 @@ TAO_HTTP_Parser::parse_string (const char *nior, port) == -1) { client.close (); - return 0; + return nullptr; } delete [] hostname; @@ -111,13 +111,13 @@ TAO_HTTP_Parser::parse_string (const char *nior, if (client.read (mb) <= 0) { client.close (); - return 0; + return nullptr; } // We get multiple message blocks back, concatenate them to // one large string ACE_CString string; - for (ACE_Message_Block * curr = mb; curr != 0; curr = curr->cont ()) + for (ACE_Message_Block * curr = mb; curr != nullptr; curr = curr->cont ()) string += curr->rd_ptr(); return orb->string_to_object (string.c_str()); diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp index 3a7f2807b69..1f8244e94b9 100644 --- a/TAO/tao/IIOP_Acceptor.cpp +++ b/TAO/tao/IIOP_Acceptor.cpp @@ -1,7 +1,3 @@ -/* - * Hook to copy all include and forward declarations. - */ -//@@ TAO_ACCEPTOR_SPL_COPY_HOOK_START #include "tao/IIOP_Acceptor.h" #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) @@ -24,15 +20,15 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_IIOP_Acceptor::TAO_IIOP_Acceptor (void) +TAO_IIOP_Acceptor::TAO_IIOP_Acceptor () : TAO_Acceptor (IOP::TAG_INTERNET_IOP), - addrs_ (0), + addrs_ (nullptr), port_span_ (1), - hosts_ (0), - hostname_in_ior_ (0), + hosts_ (nullptr), + hostname_in_ior_ (nullptr), endpoint_count_ (0), version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR), - orb_core_ (0), + orb_core_ (nullptr), reuse_addr_ (1), #if defined (ACE_HAS_IPV6) && !defined (ACE_USES_IPV4_IPV6_MIGRATION) default_address_ (static_cast<unsigned short> (0), ACE_IPV6_ANY, AF_INET6), @@ -40,9 +36,9 @@ TAO_IIOP_Acceptor::TAO_IIOP_Acceptor (void) default_address_ (static_cast<unsigned short> (0), static_cast<ACE_UINT32> (INADDR_ANY)), #endif /* ACE_HAS_IPV6 && !ACE_USES_IPV4_IPV6_MIGRATION */ base_acceptor_ (this), - creation_strategy_ (0), - concurrency_strategy_ (0), - accept_strategy_ (0) + creation_strategy_ (nullptr), + concurrency_strategy_ (nullptr), + accept_strategy_ (nullptr) { #if defined (ACE_HAS_IPV6) && defined (ACE_USES_IPV4_IPV6_MIGRATION) if (ACE::ipv6_enabled()) @@ -53,9 +49,7 @@ TAO_IIOP_Acceptor::TAO_IIOP_Acceptor (void) #endif /* ACE_HAS_IPV6 && ACE_USES_IPV4_IPV6_MIGRATION */ } -//@@ TAO_ACCEPTOR_SPL_COPY_HOOK_END - -TAO_IIOP_Acceptor::~TAO_IIOP_Acceptor (void) +TAO_IIOP_Acceptor::~TAO_IIOP_Acceptor () { // Make sure we are closed before we start destroying the // strategies. @@ -75,8 +69,6 @@ TAO_IIOP_Acceptor::~TAO_IIOP_Acceptor (void) delete [] this->hostname_in_ior_; } -//@@ TAO_ACCEPTOR_SPL_COPY_HOOK_START - // TODO = // 2) For V1.[1,2] there are tagged components int @@ -117,7 +109,7 @@ TAO_IIOP_Acceptor::create_new_profile (const TAO::ObjectKey &object_key, && ACE_OS::strcmp(this->hosts_[i], this->hosts_[0]) == 0) continue; - TAO_IIOP_Profile *pfile = 0; + TAO_IIOP_Profile *pfile = nullptr; ACE_NEW_RETURN (pfile, TAO_IIOP_Profile (this->hosts_[i], this->addrs_[i].get_port_number (), @@ -131,7 +123,7 @@ TAO_IIOP_Acceptor::create_new_profile (const TAO::ObjectKey &object_key, if (mprofile.give_profile (pfile) == -1) { pfile->_decr_refcnt (); - pfile = 0; + pfile = nullptr; return -1; } @@ -158,8 +150,8 @@ TAO_IIOP_Acceptor::create_shared_profile (const TAO::ObjectKey &object_key, CORBA::Short priority) { CORBA::ULong index = 0; - TAO_Profile *pfile = 0; - TAO_IIOP_Profile *iiop_profile = 0; + TAO_Profile *pfile = nullptr; + TAO_IIOP_Profile *iiop_profile = nullptr; // First see if @a mprofile already contains a IIOP profile. for (TAO_PHandle i = 0; i != mprofile.profile_count (); ++i) @@ -174,7 +166,7 @@ TAO_IIOP_Acceptor::create_shared_profile (const TAO::ObjectKey &object_key, // If <mprofile> doesn't contain a IIOP_Profile, we need to create // one. - if (iiop_profile == 0) + if (iiop_profile == nullptr) { ACE_NEW_RETURN (iiop_profile, TAO_IIOP_Profile (this->hosts_[0], @@ -190,7 +182,7 @@ TAO_IIOP_Acceptor::create_shared_profile (const TAO::ObjectKey &object_key, if (mprofile.give_profile (iiop_profile) == -1) { iiop_profile->_decr_refcnt (); - iiop_profile = 0; + iiop_profile = nullptr; return -1; } @@ -219,7 +211,7 @@ TAO_IIOP_Acceptor::create_shared_profile (const TAO::ObjectKey &object_key, ACE_OS::strcmp(this->hosts_[index], this->hosts_[0]) == 0) continue; - TAO_IIOP_Endpoint *endpoint = 0; + TAO_IIOP_Endpoint *endpoint = nullptr; ACE_NEW_RETURN (endpoint, TAO_IIOP_Endpoint (this->hosts_[index], this->addrs_[index].get_port_number (), @@ -239,7 +231,7 @@ TAO_IIOP_Acceptor::is_collocated (const TAO_Endpoint *endpoint) dynamic_cast<const TAO_IIOP_Endpoint *> (endpoint); // Make sure the dynamically cast pointer is valid. - if (endp == 0) + if (endp == nullptr) return 0; for (CORBA::ULong i = 0; i < this->endpoint_count_; ++i) @@ -248,7 +240,7 @@ TAO_IIOP_Acceptor::is_collocated (const TAO_Endpoint *endpoint) // this code by comparing the IP address instead. That would // trigger the following bug: // - // http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1220 + // http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1220 // if (endp->port() == this->addrs_[i].get_port_number() && ACE_OS::strcmp(endp->host(), this->hosts_[i]) == 0) @@ -259,7 +251,7 @@ TAO_IIOP_Acceptor::is_collocated (const TAO_Endpoint *endpoint) } int -TAO_IIOP_Acceptor::close (void) +TAO_IIOP_Acceptor::close () { return this->base_acceptor_.close (); } @@ -282,7 +274,7 @@ TAO_IIOP_Acceptor::open (TAO_ORB_Core *orb_core, this->orb_core_ = orb_core; - if (this->hosts_ != 0) + if (this->hosts_ != nullptr) { // The hostname cache has already been set! // This is bad mojo, i.e. an internal TAO error. @@ -293,7 +285,7 @@ TAO_IIOP_Acceptor::open (TAO_ORB_Core *orb_core, -1); } - if (address == 0) + if (address == nullptr) return -1; if (major >=0 && minor >= 0) @@ -365,9 +357,9 @@ TAO_IIOP_Acceptor::open (TAO_ORB_Core *orb_core, char *[this->endpoint_count_], -1); - this->hosts_[0] = 0; + this->hosts_[0] = nullptr; - if (this->hostname_in_ior_ != 0) + if (this->hostname_in_ior_ != nullptr) { if (TAO_debug_level > 2) { @@ -403,7 +395,7 @@ TAO_IIOP_Acceptor::open_default (TAO_ORB_Core *orb_core, { this->orb_core_ = orb_core; - if (this->hosts_ != 0) + if (this->hosts_ != nullptr) { // The hostname cache has already been set! // This is bad mojo, i.e. an internal TAO error. @@ -462,7 +454,7 @@ TAO_IIOP_Acceptor::open_i (const ACE_INET_Addr& addr, this->creation_strategy_, this->accept_strategy_, this->concurrency_strategy_, - 0, 0, 0, ACE_DEFAULT_ACCEPTOR_USE_SELECT, + nullptr, nullptr, nullptr, ACE_DEFAULT_ACCEPTOR_USE_SELECT, this->reuse_addr_) == -1) { if (TAO_debug_level > 0) @@ -498,7 +490,7 @@ TAO_IIOP_Acceptor::open_i (const ACE_INET_Addr& addr, this->creation_strategy_, this->accept_strategy_, this->concurrency_strategy_, - 0, 0, 0, ACE_DEFAULT_ACCEPTOR_USE_SELECT, + nullptr, nullptr, nullptr, ACE_DEFAULT_ACCEPTOR_USE_SELECT, this->reuse_addr_) != -1) { found_a_port = true; @@ -602,7 +594,7 @@ TAO_IIOP_Acceptor::hostname (TAO_ORB_Core *orb_core, char *&host, const char *specified_hostname) { - if (this->hostname_in_ior_ != 0) + if (this->hostname_in_ior_ != nullptr) { if (TAO_debug_level >= 5) TAOLIB_DEBUG ((LM_DEBUG, @@ -618,7 +610,7 @@ TAO_IIOP_Acceptor::hostname (TAO_ORB_Core *orb_core, // just return ours. return this->dotted_decimal_address (addr, host); } - else if (specified_hostname != 0) + else if (specified_hostname != nullptr) { // If the user specified a hostname, pass it back // blindly as it overrides our choice of hostname. @@ -718,7 +710,7 @@ TAO_IIOP_Acceptor::parse_address (const char *address, #endif /* ACE_HAS_IPV6 */ if (!host_defaulted) { - if (port_separator_loc != 0) + if (port_separator_loc != nullptr) { // Extract out just the host part of the address. size_t const len = port_separator_loc - address; @@ -747,7 +739,7 @@ TAO_IIOP_Acceptor::parse_address (const char *address, { // First convert the port into a usable form. unsigned short portno = 0; - if (port_separator_loc != 0) + if (port_separator_loc != nullptr) { portno = static_cast<u_short> (ACE_OS::atoi (port_separator_loc + @@ -759,7 +751,7 @@ TAO_IIOP_Acceptor::parse_address (const char *address, if (addr.set (this->default_address_) != 0) return -1; } - else if (port_separator_loc == 0) + else if (port_separator_loc == nullptr) { // The address is a hostname. No port was specified, so assume // port zero (port will be chosen for us). @@ -796,7 +788,7 @@ TAO_IIOP_Acceptor::dotted_decimal_address (const ACE_INET_Addr &addr, char *&host) { int result = 0; - const char *tmp = 0; + const char *tmp = nullptr; // If the IP address in the INET_Addr is the IN(6)ADDR_ANY address, // then force the actual IP address to be used by initializing a new @@ -820,7 +812,7 @@ TAO_IIOP_Acceptor::dotted_decimal_address (const ACE_INET_Addr &addr, else tmp = addr.get_host_addr (); - if (tmp == 0 || result != 0) + if (tmp == nullptr || result != 0) { if (TAO_debug_level > 0) TAOLIB_ERROR ((LM_ERROR, @@ -842,7 +834,7 @@ TAO_IIOP_Acceptor::probe_interfaces (TAO_ORB_Core *orb_core, int def_type) // it. The hostnames will then be used when creating a // TAO_IIOP_Profile for each endpoint setup on the probed // network interfaces. - ACE_INET_Addr *if_addrs = 0; + ACE_INET_Addr *if_addrs = nullptr; size_t if_cnt = 0; if (ACE::get_ip_interfaces (if_cnt, if_addrs) != 0 @@ -854,7 +846,7 @@ TAO_IIOP_Acceptor::probe_interfaces (TAO_ORB_Core *orb_core, int def_type) return -1; } - if (if_cnt == 0 || if_addrs == 0) + if (if_cnt == 0 || if_addrs == nullptr) { if (TAO_debug_level > 0) { @@ -1057,7 +1049,7 @@ TAO_IIOP_Acceptor::probe_interfaces (TAO_ORB_Core *orb_core, int def_type) } CORBA::ULong -TAO_IIOP_Acceptor::endpoint_count (void) +TAO_IIOP_Acceptor::endpoint_count () { return this->endpoint_count_; } @@ -1120,7 +1112,7 @@ TAO_IIOP_Acceptor::object_key (IOP::TaggedProfile &profile, int TAO_IIOP_Acceptor::parse_options (const char *str) { - if (str == 0) + if (str == nullptr) return 0; // No options to parse. Not a problem. // Use an option format similar to the one used for CGI scripts in @@ -1148,9 +1140,9 @@ TAO_IIOP_Acceptor::parse_options (const char *str) // `option1=foo' // `option2=bar' - ACE_CString *argv_base = 0; + ACE_CString *argv_base = nullptr; ACE_NEW_RETURN (argv_base, ACE_CString[argc],-1); - ACE_CString **argv = 0; + ACE_CString **argv = nullptr; ACE_NEW_RETURN (argv, ACE_CString*[argc],-1); ACE_CString::size_type begin = 0; @@ -1230,7 +1222,7 @@ TAO_IIOP_Acceptor::parse_options_i (int &argc, -1); if (name == "portspan") { - int range = static_cast <int> (ACE_OS::atoi (value.c_str ())); + int const range = ACE_OS::atoi (value.c_str ()); // @@ What's the lower bound on the range? zero, or one? if (range < 1 || range > ACE_MAX_DEFAULT_PORT) TAOLIB_ERROR_RETURN ((LM_ERROR, @@ -1272,5 +1264,3 @@ TAO_IIOP_Acceptor::parse_options_i (int &argc, TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */ - -//@@ TAO_ACCEPTOR_SPL_COPY_HOOK_END diff --git a/TAO/tao/IIOP_Acceptor.h b/TAO/tao/IIOP_Acceptor.h index cd8883ff27b..361580a4f40 100644 --- a/TAO/tao/IIOP_Acceptor.h +++ b/TAO/tao/IIOP_Acceptor.h @@ -45,13 +45,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Export TAO_IIOP_Acceptor : public TAO_Acceptor { public: - - /* - * Hook that marks beginning of all concrete i.e. non virtual - * methods implemented in IIOP_Acceptor class. - */ - //@@ TAO_ACCEPTOR_SPL_CONCRETE_METHODS_COPY_HOOK_START - /// Constructor. TAO_IIOP_Acceptor (void); @@ -76,8 +69,6 @@ public: typedef TAO_Concurrency_Strategy<TAO_IIOP_Connection_Handler> CONCURRENCY_STRATEGY; typedef TAO_Accept_Strategy<TAO_IIOP_Connection_Handler, ACE_SOCK_ACCEPTOR> ACCEPT_STRATEGY; - //@@ TAO_ACCEPTOR_SPL_CONCRETE_METHODS_COPY_HOOK_END - /** * The TAO_Acceptor methods, check the documentation in * Transport_Acceptor.h for details. @@ -103,7 +94,6 @@ public: virtual int object_key (IOP::TaggedProfile &profile, TAO::ObjectKey &key); - //@@ TAO_ACCEPTOR_SPL_CONCRETE_METHODS_COPY_HOOK_START /** * Set the host name for the given @a addr. * A hostname may be forced by using @a specified_hostname. This @@ -127,7 +117,6 @@ public: const char *specified_hostname = 0); protected: - /** * Helper method * Clear out 'addr' & 'specified_hostname' and initialize them based @@ -208,15 +197,12 @@ protected: int create_shared_profile (const TAO::ObjectKey &object_key, TAO_MProfile &mprofile, CORBA::Short priority); - //@@ TAO_ACCEPTOR_SPL_CONCRETE_METHODS_COPY_HOOK_END private: void operator= (const TAO_IIOP_Acceptor &); TAO_IIOP_Acceptor (const TAO_IIOP_Acceptor &); - //@@ TAO_ACCEPTOR_SPL_DATA_MEMBERS_COPY_HOOK_START protected: - /// Array of ACE_INET_Addr instances, each one corresponding to a /// given network interface. ACE_INET_Addr *addrs_; @@ -263,7 +249,6 @@ protected: ACE_INET_Addr default_address_; private: - /// The concrete acceptor, as a pointer to it's base class. BASE_ACCEPTOR base_acceptor_; @@ -271,8 +256,6 @@ private: CREATION_STRATEGY *creation_strategy_; CONCURRENCY_STRATEGY *concurrency_strategy_; ACCEPT_STRATEGY *accept_strategy_; - - //@@ TAO_ACCEPTOR_SPL_DATA_MEMBERS_COPY_HOOK_END }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp index 552eff0856b..55126126816 100644 --- a/TAO/tao/IIOP_Connection_Handler.cpp +++ b/TAO/tao/IIOP_Connection_Handler.cpp @@ -56,8 +56,8 @@ TAO_IIOP_Connection_Handler::remove_reference (void) TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler (ACE_Thread_Manager *t) - : TAO_IIOP_SVC_HANDLER (t, 0 , 0), - TAO_Connection_Handler (0), + : TAO_IIOP_SVC_HANDLER (t, nullptr , nullptr), + TAO_Connection_Handler (nullptr), dscp_codepoint_ (IPDSFIELD_DSCP_DEFAULT << 2) { // This constructor should *never* get called, it is just here to @@ -71,11 +71,11 @@ TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler (ACE_Thread_Manager *t) TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler ( TAO_ORB_Core *orb_core) - : TAO_IIOP_SVC_HANDLER (orb_core->thr_mgr (), 0, 0), + : TAO_IIOP_SVC_HANDLER (orb_core->thr_mgr (), nullptr, nullptr), TAO_Connection_Handler (orb_core), dscp_codepoint_ (IPDSFIELD_DSCP_DEFAULT << 2) { - TAO_IIOP_Transport* specific_transport = 0; + TAO_IIOP_Transport* specific_transport = nullptr; ACE_NEW (specific_transport, TAO_IIOP_Transport (this, orb_core)); @@ -86,7 +86,7 @@ TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler ( ACE_TEXT("TAO (%P|%t) - IIOP_Connection_Handler[%d]::") ACE_TEXT("IIOP_Connection_Handler, ") ACE_TEXT("this=%@\n"), - tport != 0 ? tport->id () : 0, + tport != nullptr ? tport->id () : 0, this)); } @@ -94,7 +94,7 @@ TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler ( this->transport (specific_transport); } -TAO_IIOP_Connection_Handler::~TAO_IIOP_Connection_Handler (void) +TAO_IIOP_Connection_Handler::~TAO_IIOP_Connection_Handler () { if (TAO_debug_level > 9) { @@ -103,7 +103,7 @@ TAO_IIOP_Connection_Handler::~TAO_IIOP_Connection_Handler (void) ACE_TEXT("TAO (%P|%t) - IIOP_Connection_Handler[%d]::") ACE_TEXT("~IIOP_Connection_Handler, ") ACE_TEXT("this=%@, transport=%@\n"), - tport != 0 ? tport->id () : 0, + tport != nullptr ? tport->id () : 0, this, tport)); } @@ -120,13 +120,6 @@ TAO_IIOP_Connection_Handler::~TAO_IIOP_Connection_Handler (void) } } -/* Copy hook that copies over the concrete methods from this class - * to the base Connection_Handler class as a part of the specialization - * process. Add all concrete and virtual - * methods implemented in this class within this hook. - */ -//@@ CONNECTION_HANDLER_SPL_COPY_HOOK_START - int TAO_IIOP_Connection_Handler::open_handler (void *v) { @@ -157,7 +150,7 @@ TAO_IIOP_Connection_Handler::open (void*) TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks (); - if (tph != 0) + if (tph != nullptr) { try { @@ -365,13 +358,13 @@ TAO_IIOP_Connection_Handler::open (void*) } int -TAO_IIOP_Connection_Handler::resume_handler (void) +TAO_IIOP_Connection_Handler::resume_handler () { return ACE_Event_Handler::ACE_APPLICATION_RESUMES_HANDLER; } int -TAO_IIOP_Connection_Handler::close_connection (void) +TAO_IIOP_Connection_Handler::close_connection () { // To maintain maximum compatibility, we only set this socket option // if the user has provided a linger timeout. @@ -467,13 +460,13 @@ TAO_IIOP_Connection_Handler::close (u_long flags) } int -TAO_IIOP_Connection_Handler::release_os_resources (void) +TAO_IIOP_Connection_Handler::release_os_resources () { return this->peer ().close (); } int -TAO_IIOP_Connection_Handler::add_transport_to_cache (void) +TAO_IIOP_Connection_Handler::add_transport_to_cache () { ACE_INET_Addr addr; @@ -651,7 +644,7 @@ TAO_IIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_prio { TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks (); - if (tph != 0) + if (tph != nullptr) { CORBA::Long codepoint = tph->get_dscp_codepoint (); @@ -664,7 +657,7 @@ TAO_IIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_prio } void -TAO_IIOP_Connection_Handler::abort (void) +TAO_IIOP_Connection_Handler::abort () { struct linger lval = { 0, 0 }; lval.l_onoff = 1; @@ -690,12 +683,6 @@ TAO_IIOP_Connection_Handler::handle_write_ready (const ACE_Time_Value *timeout) return ACE::handle_write_ready (this->peer ().get_handle (), timeout); } - -//@@ CONNECTION_HANDLER_SPL_COPY_HOOK_END -/* - * End copy hook - */ - TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */ diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp index 0992972b9d7..28ea80707e8 100644 --- a/TAO/tao/IIOP_Connector.cpp +++ b/TAO/tao/IIOP_Connector.cpp @@ -50,7 +50,7 @@ class TAO_IIOP_Connection_Handler_Array_Guard { public: TAO_IIOP_Connection_Handler_Array_Guard (TAO_IIOP_Connection_Handler **p, unsigned count); - ~TAO_IIOP_Connection_Handler_Array_Guard (void); + ~TAO_IIOP_Connection_Handler_Array_Guard (); private: /// Handler. @@ -66,10 +66,10 @@ TAO_IIOP_Connection_Handler_Array_Guard::TAO_IIOP_Connection_Handler_Array_Guard { } -TAO_IIOP_Connection_Handler_Array_Guard::~TAO_IIOP_Connection_Handler_Array_Guard (void) +TAO_IIOP_Connection_Handler_Array_Guard::~TAO_IIOP_Connection_Handler_Array_Guard () { ACE_Errno_Guard eguard (errno); - if (this->ptr_ != 0) + if (this->ptr_ != nullptr) { for (unsigned i = 0; i < this->count_; i++) this->ptr_[i]->remove_reference (); @@ -79,15 +79,14 @@ TAO_IIOP_Connection_Handler_Array_Guard::~TAO_IIOP_Connection_Handler_Array_Guar //--------------------------------------------------------------------------- -TAO_IIOP_Connector::~TAO_IIOP_Connector (void) +TAO_IIOP_Connector::~TAO_IIOP_Connector () { } -//@@ TAO_CONNECTOR_SPL_COPY_HOOK_START -TAO_IIOP_Connector::TAO_IIOP_Connector (void) +TAO_IIOP_Connector::TAO_IIOP_Connector () : TAO_Connector (IOP::TAG_INTERNET_IOP) , connect_strategy_ () - , base_connector_ (0) + , base_connector_ (nullptr) { } @@ -106,7 +105,7 @@ TAO_IIOP_Connector::open (TAO_ORB_Core *orb_core) return -1; /// Our connect creation strategy - TAO_IIOP_CONNECT_CREATION_STRATEGY *connect_creation_strategy = 0; + TAO_IIOP_CONNECT_CREATION_STRATEGY *connect_creation_strategy = nullptr; ACE_NEW_RETURN (connect_creation_strategy, TAO_IIOP_CONNECT_CREATION_STRATEGY @@ -115,7 +114,7 @@ TAO_IIOP_Connector::open (TAO_ORB_Core *orb_core) -1); /// Our activation strategy - TAO_IIOP_CONNECT_CONCURRENCY_STRATEGY *concurrency_strategy = 0; + TAO_IIOP_CONNECT_CONCURRENCY_STRATEGY *concurrency_strategy = nullptr; ACE_NEW_RETURN (concurrency_strategy, TAO_IIOP_CONNECT_CONCURRENCY_STRATEGY (orb_core), @@ -128,7 +127,7 @@ TAO_IIOP_Connector::open (TAO_ORB_Core *orb_core) } int -TAO_IIOP_Connector::close (void) +TAO_IIOP_Connector::close () { delete this->base_connector_.concurrency_strategy (); delete this->base_connector_.creation_strategy (); @@ -136,7 +135,7 @@ TAO_IIOP_Connector::close (void) } int -TAO_IIOP_Connector::supports_parallel_connects(void) const +TAO_IIOP_Connector::supports_parallel_connects() const { return 1; } @@ -146,7 +145,7 @@ TAO_IIOP_Connector::set_validate_endpoint (TAO_Endpoint *endpoint) { TAO_IIOP_Endpoint *iiop_endpoint = this->remote_endpoint (endpoint); - if (iiop_endpoint == 0) + if (iiop_endpoint == nullptr) return -1; const ACE_INET_Addr &remote_address = iiop_endpoint->object_addr (); @@ -181,11 +180,11 @@ TAO_IIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r, TAO_Transport_Descriptor_Interface &desc, ACE_Time_Value *timeout) { - TAO_IIOP_Connection_Handler *svc_handler = 0; + TAO_IIOP_Connection_Handler *svc_handler = nullptr; TAO_IIOP_Endpoint *iiop_endpoint = this->remote_endpoint (desc.endpoint()); - if (iiop_endpoint == 0) - return 0; + if (iiop_endpoint == nullptr) + return nullptr; int const result = this->begin_connection (svc_handler, r, iiop_endpoint, timeout); @@ -205,7 +204,7 @@ TAO_IIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r, iiop_endpoint->port (), ACE_TEXT("errno"))); } - return 0; + return nullptr; } TAO_IIOP_Connection_Handler **sh_ptr = &svc_handler; @@ -225,7 +224,7 @@ TAO_IIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r, // If complete_connection was unsuccessful then remove // the last reference that we have to the svc_handler. - if (transport == 0) + if (transport == nullptr) { if (TAO_debug_level > 1) { @@ -235,7 +234,7 @@ TAO_IIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r, iiop_endpoint->host (), iiop_endpoint->port ())); } - return 0; + return nullptr; } svc_handler_auto_ptr.release (); @@ -254,8 +253,8 @@ TAO_IIOP_Connector::make_parallel_connection ( this->orb_core ()->orb_params ()->parallel_connect_delay (); time_t sec_stagger = ns_stagger/1000; ns_stagger = (ns_stagger % 1000) * 1000000; - for (TAO_Endpoint *ep = root_ep->next_filtered (this->orb_core(), 0); - ep != 0; + for (TAO_Endpoint *ep = root_ep->next_filtered (this->orb_core(), nullptr); + ep != nullptr; ep = ep->next_filtered (this->orb_core(), root_ep)) ++max_count; @@ -264,20 +263,20 @@ TAO_IIOP_Connector::make_parallel_connection ( ACE_TEXT ("TAO (%P|%t) - IIOP_Connector::") ACE_TEXT ("make_parallel_connection, ") ACE_TEXT ("to %d endpoints\n"), max_count)); - TAO_IIOP_Endpoint **eplist = 0; - TAO_IIOP_Connection_Handler **shlist = 0; - ACE_NEW_RETURN (shlist, TAO_IIOP_Connection_Handler *[max_count], 0); - ACE_NEW_RETURN (eplist, TAO_IIOP_Endpoint *[max_count], 0); + TAO_IIOP_Endpoint **eplist = nullptr; + TAO_IIOP_Connection_Handler **shlist = nullptr; + ACE_NEW_RETURN (shlist, TAO_IIOP_Connection_Handler *[max_count], nullptr); + ACE_NEW_RETURN (eplist, TAO_IIOP_Endpoint *[max_count], nullptr); TAO_LF_Multi_Event mev; int result = 0; unsigned count = 0; - for (TAO_Endpoint *ep = root_ep->next_filtered (this->orb_core(),0); - ep != 0; + for (TAO_Endpoint *ep = root_ep->next_filtered (this->orb_core(),nullptr); + ep != nullptr; ep = ep->next_filtered(this->orb_core(),root_ep)) { eplist[count] = this->remote_endpoint (ep); - shlist[count] = 0; + shlist[count] = nullptr; result = this->begin_connection (shlist[count], r, eplist[count], @@ -292,7 +291,7 @@ TAO_IIOP_Connector::make_parallel_connection ( if (errno == EWOULDBLOCK) { mev.add_event(shlist[count++]); - if (ep->next() != 0) + if (ep->next() != nullptr) { struct timespec nsleep = {sec_stagger, ns_stagger}; ACE_OS::nanosleep (&nsleep); @@ -315,7 +314,7 @@ TAO_IIOP_Connector::make_parallel_connection ( } } - TAO_Transport *winner = 0; + TAO_Transport *winner = nullptr; if (count > 0) // only complete if at least one pending or success { // Make sure that we always do a remove_reference for every member @@ -382,7 +381,7 @@ TAO_IIOP_Connector::begin_connection (TAO_IIOP_Connection_Handler *&svc_handler, // The code used to set the timeout to zero, with the intent of // polling the reactor for connection completion. However, the side-effect // was to cause the connection to timeout immediately. - svc_handler = 0; + svc_handler = nullptr; int result = -1; u_short span = this->orb_core ()->orb_params ()->iiop_client_port_span (); @@ -406,10 +405,10 @@ TAO_IIOP_Connector::begin_connection (TAO_IIOP_Connection_Handler *&svc_handler, } else { - if (svc_handler != 0) + if (svc_handler != nullptr) { svc_handler->remove_reference (); - svc_handler = 0; + svc_handler = nullptr; } } } @@ -424,19 +423,19 @@ namespace TAO_IIOP { public: TList_Holder (size_t count) - : tlist_ (0) + : tlist_ (nullptr) { // Resources are acquired during initialization (RAII) ACE_NEW (tlist_, TAO_Transport*[count]); } - ~TList_Holder (void) + ~TList_Holder () { // Resources are unacquired during uninitialization delete [] tlist_; } - operator TAO_Transport** (void) + operator TAO_Transport** () { return tlist_; } @@ -461,7 +460,7 @@ TAO_IIOP_Connector::complete_connection (int result, { TAO_IIOP::TList_Holder tlist(count); - TAO_Transport *transport = 0; + TAO_Transport *transport = nullptr; // populate the transport list for (unsigned i = 0; i < count; i++) @@ -483,7 +482,7 @@ TAO_IIOP_Connector::complete_connection (int result, { // Cache is full, so close the connection again sh_list[count-1]->close (); - transport = 0; + transport = nullptr; } } else @@ -541,10 +540,10 @@ TAO_IIOP_Connector::complete_connection (int result, // At this point, the connection has been successfully created // connected or not connected, but we have a connection. - TAO_IIOP_Connection_Handler *svc_handler = 0; - TAO_IIOP_Endpoint *iiop_endpoint = 0; + TAO_IIOP_Connection_Handler *svc_handler = nullptr; + TAO_IIOP_Endpoint *iiop_endpoint = nullptr; - if (transport != 0) + if (transport != nullptr) { for (unsigned i = 0; i < count; i++) { @@ -572,7 +571,7 @@ TAO_IIOP_Connector::complete_connection (int result, ACE_TEXT("errno"))); } } - return 0; + return nullptr; } TAO_Leader_Follower &leader_follower = this->orb_core ()->leader_follower (); @@ -600,7 +599,7 @@ TAO_IIOP_Connector::complete_connection (int result, ACE_TEXT("TAO (%P|%t) - IIOP_Connector::make_connection, ") ACE_TEXT("transport in error before cache!\n"))); transport->connection_handler()->cancel_pending_connection(); - return 0; + return nullptr; } if (TAO_debug_level > 2) @@ -646,7 +645,7 @@ TAO_IIOP_Connector::complete_connection (int result, ACE_TEXT ("could not add new connection to cache\n"))); } - return 0; + return nullptr; } // Other part of fix for bug 2654. @@ -662,7 +661,7 @@ TAO_IIOP_Connector::complete_connection (int result, ACE_TEXT("transport in error after cache!\n"))); svc_handler->cancel_pending_connection(); transport->purge_entry(); - return 0; + return nullptr; } @@ -678,7 +677,7 @@ TAO_IIOP_Connector::complete_connection (int result, // deal with the transport cache if there is a failure. if (!transport->register_if_necessary ()) { - return 0; + return nullptr; } return transport; @@ -687,30 +686,30 @@ TAO_IIOP_Connector::complete_connection (int result, TAO_Profile * TAO_IIOP_Connector::create_profile (TAO_InputCDR& cdr) { - TAO_Profile *pfile = 0; + TAO_Profile *pfile = nullptr; ACE_NEW_RETURN (pfile, TAO_IIOP_Profile (this->orb_core ()), - 0); + nullptr); int const r = pfile->decode (cdr); if (r == -1) { pfile->_decr_refcnt (); - pfile = 0; + pfile = nullptr; } return pfile; } TAO_Profile * -TAO_IIOP_Connector::make_profile (void) +TAO_IIOP_Connector::make_profile () { // The endpoint should be of the form: // N.n@host:port/object_key // or: // host:port/object_key - TAO_Profile *profile = 0; + TAO_Profile *profile = nullptr; ACE_NEW_THROW_EX (profile, TAO_IIOP_Profile (this->orb_core ()), CORBA::NO_MEMORY ( @@ -751,7 +750,7 @@ TAO_IIOP_Connector::check_prefix (const char *endpoint) } char -TAO_IIOP_Connector::object_key_delimiter (void) const +TAO_IIOP_Connector::object_key_delimiter () const { return TAO_IIOP_Profile::object_key_delimiter_; } @@ -760,13 +759,13 @@ TAO_IIOP_Endpoint * TAO_IIOP_Connector::remote_endpoint (TAO_Endpoint *endpoint) { if (endpoint->tag () != IOP::TAG_INTERNET_IOP) - return 0; + return nullptr; TAO_IIOP_Endpoint *iiop_endpoint = dynamic_cast<TAO_IIOP_Endpoint *> (endpoint ); - if (iiop_endpoint == 0) - return 0; + if (iiop_endpoint == nullptr) + return nullptr; return iiop_endpoint; } @@ -788,8 +787,6 @@ TAO_IIOP_Connector::cancel_svc_handler ( return -1; } -//@@ TAO_CONNECTOR_SPL_COPY_HOOK_END - TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */ diff --git a/TAO/tao/IIOP_Connector.h b/TAO/tao/IIOP_Connector.h index c0de19a25d0..1ecabbcf012 100644 --- a/TAO/tao/IIOP_Connector.h +++ b/TAO/tao/IIOP_Connector.h @@ -67,9 +67,6 @@ public: virtual char object_key_delimiter (void) const; public: - - //@@ TAO_CONNECTOR_SPL_PUBLIC_METHODS_COPY_HOOK_START - typedef TAO_Connect_Concurrency_Strategy<TAO_IIOP_Connection_Handler> TAO_IIOP_CONNECT_CONCURRENCY_STRATEGY; @@ -83,7 +80,6 @@ public: typedef ACE_Strategy_Connector<TAO_IIOP_Connection_Handler, ACE_SOCK_CONNECTOR> TAO_IIOP_BASE_CONNECTOR; - //@@ TAO_CONNECTOR_SPL_PUBLIC_METHODS_COPY_HOOK_END protected: /// A flag indicating the actual connector supports parallel @@ -113,12 +109,6 @@ protected: /// Cancel the passed cvs handler from the connector virtual int cancel_svc_handler (TAO_Connection_Handler * svc_handler); -/* - * Hook to copy over the protected and private data from this class to - * base Connector class. - */ -//@@ TAO_CONNECTOR_SPL_COPY_HOOK_START - private: /// This is the first half of making a connection. Both make_connection /// and make_parallel_connection will start out using begin_connection. @@ -146,15 +136,11 @@ private: TAO_IIOP_Endpoint *remote_endpoint (TAO_Endpoint *ep); private: - /// Our connect strategy TAO_IIOP_CONNECT_STRATEGY connect_strategy_; /// The connector initiating connection requests for IIOP. TAO_IIOP_BASE_CONNECTOR base_connector_; - -//@@ TAO_CONNECTOR_SPL_COPY_HOOK_END - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IIOP_Endpoint.cpp b/TAO/tao/IIOP_Endpoint.cpp index ee036dfc7e3..8ec0fde8237 100644 --- a/TAO/tao/IIOP_Endpoint.cpp +++ b/TAO/tao/IIOP_Endpoint.cpp @@ -1,10 +1,4 @@ // -*- C++ -*- -/* - * Add all include files within the following - * two markers. - */ -//@@ TAO_ENDPOINT_SPL_COPY_HOOK_START - #include "tao/IIOP_Endpoint.h" #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) @@ -31,11 +25,8 @@ #include "ace/INET_Addr.h" #include "ace/Sock_Connect.h" -//@@ TAO_ENDPOINT_SPL_COPY_HOOK_END - TAO_BEGIN_VERSIONED_NAMESPACE_DECL -//@@ TAO_ENDPOINT_SPL_COPY_HOOK_START TAO_IIOP_Endpoint::TAO_IIOP_Endpoint (const ACE_INET_Addr &addr, int use_dotted_decimal_addresses) : TAO_Endpoint (IOP::TAG_INTERNET_IOP) @@ -48,7 +39,7 @@ TAO_IIOP_Endpoint::TAO_IIOP_Endpoint (const ACE_INET_Addr &addr, , object_addr_set_ (false) , object_addr_ (addr) , preferred_path_ () - , next_ (0) + , next_ (nullptr) { this->set (addr, use_dotted_decimal_addresses); } @@ -67,12 +58,12 @@ TAO_IIOP_Endpoint::TAO_IIOP_Endpoint (const char *host, , object_addr_set_ (false) , object_addr_ (addr) , preferred_path_ () - , next_ (0) + , next_ (nullptr) { this->host(host); // With IPv6 performs check for decimal address } -TAO_IIOP_Endpoint::TAO_IIOP_Endpoint (void) +TAO_IIOP_Endpoint::TAO_IIOP_Endpoint () : TAO_Endpoint (IOP::TAG_INTERNET_IOP) , host_ () , port_ (683) // default port (IANA assigned) @@ -83,7 +74,7 @@ TAO_IIOP_Endpoint::TAO_IIOP_Endpoint (void) , object_addr_set_ (false) , object_addr_ () , preferred_path_ () - , next_ (0) + , next_ (nullptr) { } @@ -100,12 +91,10 @@ TAO_IIOP_Endpoint::TAO_IIOP_Endpoint (const char *host, , object_addr_set_ (false) , object_addr_ () , preferred_path_ () - , next_ (0) + , next_ (nullptr) { this->host(host); // With IPv6 performs check for decimal address } -//@@ TAO_ENDPOINT_SPL_COPY_HOOK_END - TAO_IIOP_Endpoint & TAO_IIOP_Endpoint::operator= (const TAO_IIOP_Endpoint &other) @@ -121,17 +110,15 @@ TAO_IIOP_Endpoint::operator= (const TAO_IIOP_Endpoint &other) this->object_addr_set_ = other.object_addr_set_; this->object_addr_ = other.object_addr_; this->preferred_path_ = other.preferred_path_; - this->next_ = 0; // do not copy list membership, since we are only cloning the values + this->next_ = nullptr; // do not copy list membership, since we are only cloning the values } return *this; } -TAO_IIOP_Endpoint::~TAO_IIOP_Endpoint (void) +TAO_IIOP_Endpoint::~TAO_IIOP_Endpoint () { } -//@@ TAO_ENDPOINT_SPL_COPY_HOOK_START - TAO_IIOP_Endpoint::TAO_IIOP_Endpoint (const TAO_IIOP_Endpoint &rhs) : TAO_Endpoint (rhs.tag_, rhs.priority_) , host_ (rhs.host_) @@ -143,7 +130,7 @@ TAO_IIOP_Endpoint::TAO_IIOP_Endpoint (const TAO_IIOP_Endpoint &rhs) , object_addr_set_ (rhs.object_addr_set_) , object_addr_ (rhs.object_addr_) , preferred_path_ (rhs.preferred_path_) - , next_ (0) + , next_ (nullptr) { } @@ -169,7 +156,7 @@ TAO_IIOP_Endpoint::set (const ACE_INET_Addr &addr, } const char *tmp = addr.get_host_addr (); - if (tmp == 0) + if (tmp == nullptr) { if (TAO_debug_level > 0) { @@ -239,7 +226,7 @@ TAO_IIOP_Endpoint::host (const char *h) } TAO_Endpoint * -TAO_IIOP_Endpoint::next (void) +TAO_IIOP_Endpoint::next () { return this->next_; } @@ -273,8 +260,8 @@ TAO_IIOP_Endpoint::next_filtered_i (TAO_IIOP_Endpoint *root, // the candidate is nominally the next entry in the list, but since // the list may loop back on itself, the root of the list needs to be // initialized. - TAO_IIOP_Endpoint *candidate = (root == 0) ? this : next_; - if (root == 0) + TAO_IIOP_Endpoint *candidate = (root == nullptr) ? this : next_; + if (root == nullptr) root = this; #if defined (ACE_HAS_IPV6) @@ -314,18 +301,18 @@ TAO_IIOP_Endpoint::next_filtered_i (TAO_IIOP_Endpoint *root, } TAO_Endpoint * -TAO_IIOP_Endpoint::duplicate (void) +TAO_IIOP_Endpoint::duplicate () { - TAO_IIOP_Endpoint *endpoint = 0; + TAO_IIOP_Endpoint *endpoint = nullptr; // @@ NOTE: Not exception safe.. - ACE_NEW_RETURN (endpoint, TAO_IIOP_Endpoint (*this), 0); + ACE_NEW_RETURN (endpoint, TAO_IIOP_Endpoint (*this), nullptr); return endpoint; } const ACE_INET_Addr & -TAO_IIOP_Endpoint::object_addr (void) const +TAO_IIOP_Endpoint::object_addr () const { // The object_addr_ is initialized here, rather than at IOR decode // time for several reasons: @@ -351,7 +338,7 @@ TAO_IIOP_Endpoint::object_addr (void) const } void -TAO_IIOP_Endpoint::object_addr_i (void) const +TAO_IIOP_Endpoint::object_addr_i () const { // We should have already held the lock @@ -414,7 +401,7 @@ TAO_IIOP_Endpoint::add_local_endpoint (TAO_IIOP_Endpoint *ep, static void TAO_IIOP_Endpoint_get_ip_interfaces (ACE_Vector<ACE_CString> &local_ips) { - ACE_INET_Addr* tmp = 0; + ACE_INET_Addr* tmp = nullptr; size_t cnt = 0u; int err = ACE::get_ip_interfaces (cnt, tmp); if (err != 0) @@ -427,7 +414,7 @@ TAO_IIOP_Endpoint_get_ip_interfaces (ACE_Vector<ACE_CString> &local_ips) for (size_t i = 0u; i < cnt; ++i) { const char *s_if = tmp[i].get_host_addr (buf, sizeof (buf)); - ACE_ASSERT (s_if != 0); + ACE_ASSERT (s_if != nullptr); ACE_CString tmp (s_if); local_ips.push_back (tmp); } @@ -548,7 +535,7 @@ TAO_IIOP_Endpoint::preferred_interfaces (const char *csv, find_preferred_interfaces(this->host_.in(), csv, preferred); CORBA::ULong count = static_cast<CORBA::ULong> (preferred.size()); size_t i = 0; - while (i < count && ACE_OS::strstr (preferred[i].c_str(), "if=") != 0) + while (i < count && ACE_OS::strstr (preferred[i].c_str(), "if=") != nullptr) { // For now we disregard these with IIOP ++i; @@ -560,7 +547,7 @@ TAO_IIOP_Endpoint::preferred_interfaces (const char *csv, TAO_IIOP_Endpoint* ep = this; for (++i; i < count; ++i) { - if (ACE_OS::strstr (preferred[i].c_str(), "if=") == 0) + if (ACE_OS::strstr (preferred[i].c_str(), "if=") == nullptr) ep = add_local_endpoint (ep, preferred[i].c_str(), profile); } @@ -584,7 +571,7 @@ TAO_IIOP_Endpoint::is_equivalent (const TAO_Endpoint *other_endpoint) const TAO_IIOP_Endpoint *endpoint = dynamic_cast<const TAO_IIOP_Endpoint *> (other_endpoint); - if (endpoint == 0) + if (endpoint == nullptr) return 0; return (this->port_ == endpoint->port_ @@ -592,7 +579,7 @@ TAO_IIOP_Endpoint::is_equivalent (const TAO_Endpoint *other_endpoint) } CORBA::ULong -TAO_IIOP_Endpoint::hash (void) +TAO_IIOP_Endpoint::hash () { if (this->hash_val_ != 0) return this->hash_val_; @@ -622,20 +609,18 @@ TAO_IIOP_Endpoint::hash (void) } bool -TAO_IIOP_Endpoint::is_preferred_network (void) const +TAO_IIOP_Endpoint::is_preferred_network () const { - return (this->preferred_path_.host.in () != 0 && + return (this->preferred_path_.host.in () != nullptr && this->preferred_path_.host.in ()[0] != 0); } const char * -TAO_IIOP_Endpoint::preferred_network (void) const +TAO_IIOP_Endpoint::preferred_network () const { return this->preferred_path_.host.in (); } -//@@ TAO_ENDPOINT_SPL_COPY_HOOK_END - TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */ diff --git a/TAO/tao/IIOP_Endpoint.h b/TAO/tao/IIOP_Endpoint.h index 47db490ef26..4279c0fa733 100644 --- a/TAO/tao/IIOP_Endpoint.h +++ b/TAO/tao/IIOP_Endpoint.h @@ -45,8 +45,6 @@ class TAO_IIOP_Profile; class TAO_Export TAO_IIOP_Endpoint : public TAO_Endpoint { public: - //@@ TAO_ENDPOINT_SPL_PUBLIC_METHODS_COPY_HOOK_START - // @todo Lose these friends! friend class TAO_IIOP_Profile; friend class TAO_SSLIOP_Profile; @@ -70,9 +68,6 @@ public: CORBA::UShort port, CORBA::Short priority); - - //@@ TAO_ENDPOINT_SPL_PUBLIC_METHODS_COPY_HOOK_END - /// Destructor. ~TAO_IIOP_Endpoint (void); @@ -113,12 +108,6 @@ public: // = IIOP_Endpoint-specific methods. - /* - * Hook to copy only the non virtual concrete methods implemented - * in this class to the derived class in the specialization. - */ - //@@ TAO_ENDPOINT_SPL_PUBLIC_METHODS_COPY_HOOK_START - /// Return a reference to the <object_addr>. const ACE_INET_Addr &object_addr (void) const; @@ -147,9 +136,6 @@ public: bool is_ipv6_decimal (void) const; #endif /* ACE_HAS_IPV6 */ - //@@ TAO_ENDPOINT_SPL_PUBLIC_METHODS_COPY_HOOK_END - - /// Need to have an assignment operator since the IIOP_Profile class may /// have to reorder its list of endpoints based on filtering by the EndpointPolicy. TAO_IIOP_Endpoint & operator= (const TAO_IIOP_Endpoint& other); @@ -169,9 +155,6 @@ private: bool prefer_ipv6, bool want_ipv6); - - //@@ TAO_ENDPOINT_SPL_PRIVATE_DATA_COPY_HOOK_START - /// Helper method for setting INET_Addr. int set (const ACE_INET_Addr &addr, int use_dotted_decimal_addresses); @@ -228,8 +211,6 @@ private: /// IIOP Endpoints can be strung into a list. Return the next /// endpoint in the list, if any. TAO_IIOP_Endpoint *next_; - - //@@ TAO_ENDPOINT_SPL_PRIVATE_DATA_COPY_HOOK_END }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IIOP_Factory.cpp b/TAO/tao/IIOP_Factory.cpp index 33b614739de..d8155105036 100644 --- a/TAO/tao/IIOP_Factory.cpp +++ b/TAO/tao/IIOP_Factory.cpp @@ -12,12 +12,12 @@ static const char the_prefix[] = "iiop"; TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_IIOP_Protocol_Factory::TAO_IIOP_Protocol_Factory (void) +TAO_IIOP_Protocol_Factory::TAO_IIOP_Protocol_Factory () : TAO_Protocol_Factory (IOP::TAG_INTERNET_IOP) { } -TAO_IIOP_Protocol_Factory::~TAO_IIOP_Protocol_Factory (void) +TAO_IIOP_Protocol_Factory::~TAO_IIOP_Protocol_Factory () { } @@ -29,25 +29,25 @@ TAO_IIOP_Protocol_Factory::match_prefix (const ACE_CString &prefix) } const char * -TAO_IIOP_Protocol_Factory::prefix (void) const +TAO_IIOP_Protocol_Factory::prefix () const { return ::the_prefix; } char -TAO_IIOP_Protocol_Factory::options_delimiter (void) const +TAO_IIOP_Protocol_Factory::options_delimiter () const { return '/'; } TAO_Acceptor * -TAO_IIOP_Protocol_Factory::make_acceptor (void) +TAO_IIOP_Protocol_Factory::make_acceptor () { - TAO_Acceptor *acceptor = 0; + TAO_Acceptor *acceptor = nullptr; ACE_NEW_RETURN (acceptor, TAO_IIOP_Acceptor, - 0); + nullptr); return acceptor; } @@ -60,18 +60,18 @@ TAO_IIOP_Protocol_Factory::init (int /* argc */, } TAO_Connector * -TAO_IIOP_Protocol_Factory::make_connector (void) +TAO_IIOP_Protocol_Factory::make_connector () { - TAO_Connector *connector = 0; + TAO_Connector *connector = nullptr; ACE_NEW_RETURN (connector, TAO_IIOP_Connector, - 0); + nullptr); return connector; } int -TAO_IIOP_Protocol_Factory::requires_explicit_endpoint (void) const +TAO_IIOP_Protocol_Factory::requires_explicit_endpoint () const { return 0; } diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp index fee07e0b832..a33b42085e7 100644 --- a/TAO/tao/IIOP_Profile.cpp +++ b/TAO/tao/IIOP_Profile.cpp @@ -17,14 +17,14 @@ static const char the_prefix[] = "iiop"; TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_IIOP_Profile::~TAO_IIOP_Profile (void) +TAO_IIOP_Profile::~TAO_IIOP_Profile () { // Clean up the list of endpoints since we own it. // Skip the head, since it is not dynamically allocated. - TAO_Endpoint *tmp = 0; + TAO_Endpoint *tmp = nullptr; for (TAO_Endpoint *next = this->endpoint ()->next (); - next != 0; + next != nullptr; next = tmp) { tmp = next->next (); @@ -32,18 +32,14 @@ TAO_IIOP_Profile::~TAO_IIOP_Profile (void) } } -//@@ TAO_PROFILE_SPL_COPY_HOOK_START - const char TAO_IIOP_Profile::object_key_delimiter_ = '/'; char -TAO_IIOP_Profile::object_key_delimiter (void) const +TAO_IIOP_Profile::object_key_delimiter () const { return TAO_IIOP_Profile::object_key_delimiter_; } -//@@ TAO_PROFILE_SPL_COPY_HOOK_END - TAO_IIOP_Profile::TAO_IIOP_Profile (const ACE_INET_Addr &addr, const TAO::ObjectKey &object_key, const TAO_GIOP_Message_Version &version, @@ -86,7 +82,6 @@ TAO_IIOP_Profile::TAO_IIOP_Profile (TAO_ORB_Core *orb_core) { } -//@@ TAO_PROFILE_SPL_COPY_HOOK_START int TAO_IIOP_Profile::decode_profile (TAO_InputCDR& cdr) { @@ -115,7 +110,7 @@ TAO_IIOP_Profile::decode_profile (TAO_InputCDR& cdr) this->endpoint_.object_addr_.set_type (-1); const char* csv = this->orb_core()->orb_params()->preferred_interfaces(); - if (csv != 0 && *csv != '\0') + if (csv != nullptr && *csv != '\0') { bool const enforce = this->orb_core()->orb_params()->enforce_pref_interfaces(); @@ -135,7 +130,7 @@ TAO_IIOP_Profile::parse_string_i (const char *ior) const char *okd = ACE_OS::strchr (ior, this->object_key_delimiter_); - if (okd == 0 || okd == ior) + if (okd == nullptr || okd == ior) { // No object key delimiter or no hostname specified. throw ::CORBA::INV_OBJREF ( @@ -149,7 +144,7 @@ TAO_IIOP_Profile::parse_string_i (const char *ior) CORBA::ULong length_host = 0; const char *cp_pos_overrun = ACE_OS::strchr (ior, ':'); // Look for a port - const char *cp_pos = (cp_pos_overrun < okd) ? cp_pos_overrun : 0; // but before object key + const char *cp_pos = (cp_pos_overrun < okd) ? cp_pos_overrun : nullptr; // but before object key #if defined (ACE_HAS_IPV6) // IPv6 numeric address in host string? bool ipv6_in_host = false; @@ -208,13 +203,13 @@ TAO_IIOP_Profile::parse_string_i (const char *ior) EINVAL), CORBA::COMPLETED_NO); } - else if (cp_pos != 0) + else if (cp_pos != nullptr) { // A port number or port name was specified. CORBA::ULong length_port = ACE_Utils::truncate_cast<CORBA::ULong> (okd - cp_pos - 1); CORBA::String_var tmp = CORBA::string_alloc (length_port); - if (tmp.in() != 0) + if (tmp.in() != nullptr) { ACE_OS::strncpy (tmp.inout (), cp_pos + 1, length_port); tmp[length_port] = '\0'; @@ -225,7 +220,7 @@ TAO_IIOP_Profile::parse_string_i (const char *ior) this->endpoint_.port_ = 2809; // default IIOP port for // parsing corbaloc strings } - else if (tmp.in () != 0 && ACE_OS::strspn (tmp.in (), "1234567890") == length_port) + else if (tmp.in () != nullptr && ACE_OS::strspn (tmp.in (), "1234567890") == length_port) { this->endpoint_.port_ = static_cast<CORBA::UShort> (ACE_OS::atoi (tmp.in ())); @@ -233,7 +228,7 @@ TAO_IIOP_Profile::parse_string_i (const char *ior) else { ACE_INET_Addr ia; - if (tmp.in () == 0 || ia.string_to_addr (tmp.in ()) == -1) + if (tmp.in () == nullptr || ia.string_to_addr (tmp.in ()) == -1) { throw ::CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( @@ -327,7 +322,7 @@ TAO_IIOP_Profile::do_is_equivalent (const TAO_Profile *other_profile) dynamic_cast<const TAO_IIOP_Profile *> (other_profile); // Make sure we have a TAO_IIOP_Profile. - if (op == 0) + if (op == nullptr) return false; if (this->count_ == 0 && op->count_ == 0) @@ -337,7 +332,7 @@ TAO_IIOP_Profile::do_is_equivalent (const TAO_Profile *other_profile) // Check endpoints equivalence. const TAO_IIOP_Endpoint *other_endp = &op->endpoint_; for (TAO_IIOP_Endpoint *endp = &this->endpoint_; - endp != 0; + endp != nullptr; endp = endp->next_) { if (endp->is_equivalent (other_endp)) @@ -355,7 +350,7 @@ TAO_IIOP_Profile::hash (CORBA::ULong max) // Get the hash value for all endpoints. CORBA::ULong hashval = 0; for (TAO_IIOP_Endpoint *endp = &this->endpoint_; - endp != 0; + endp != nullptr; endp = endp->next_) { hashval += endp->hash (); @@ -379,13 +374,13 @@ TAO_IIOP_Profile::hash (CORBA::ULong max) } TAO_Endpoint* -TAO_IIOP_Profile::endpoint (void) +TAO_IIOP_Profile::endpoint () { return &this->endpoint_; } TAO_Endpoint * -TAO_IIOP_Profile::base_endpoint (void) +TAO_IIOP_Profile::base_endpoint () { // do not call endpoint(), return the value directly. This is to // avoid calling a derived implementation of endpoint(). @@ -393,7 +388,7 @@ TAO_IIOP_Profile::base_endpoint (void) } CORBA::ULong -TAO_IIOP_Profile::endpoint_count (void) const +TAO_IIOP_Profile::endpoint_count () const { return this->count_; } @@ -410,7 +405,7 @@ TAO_IIOP_Profile::add_endpoint (TAO_IIOP_Endpoint *endp) void TAO_IIOP_Profile::remove_endpoint (TAO_IIOP_Endpoint *endp) { - if (endp == 0) + if (endp == nullptr) return; // special handling for the target matching the base endpoint @@ -435,7 +430,7 @@ TAO_IIOP_Profile::remove_endpoint (TAO_IIOP_Endpoint *endp) TAO_IIOP_Endpoint* prev = &this->endpoint_; TAO_IIOP_Endpoint* cur = this->endpoint_.next_; - while (cur != 0) + while (cur != nullptr) { if (cur == endp) break; @@ -443,10 +438,10 @@ TAO_IIOP_Profile::remove_endpoint (TAO_IIOP_Endpoint *endp) cur = cur->next_; } - if (cur != 0) + if (cur != nullptr) { prev->next_ = cur->next_; - cur->next_ = 0; + cur->next_ = nullptr; --this->count_; if (this->last_endpoint_ == cur) { @@ -466,7 +461,7 @@ void TAO_IIOP_Profile::add_generic_endpoint (TAO_Endpoint *endp) { TAO_IIOP_Endpoint *iep = dynamic_cast<TAO_IIOP_Endpoint *>(endp); - if (iep != 0) + if (iep != nullptr) { TAO_IIOP_Endpoint *clone; ACE_NEW (clone, TAO_IIOP_Endpoint(*iep)); @@ -475,7 +470,7 @@ TAO_IIOP_Profile::add_generic_endpoint (TAO_Endpoint *endp) } char * -TAO_IIOP_Profile::to_string (void) const +TAO_IIOP_Profile::to_string () const { // corbaloc:iiop:1.2@host:port,iiop:1.2@host:port,.../key @@ -492,8 +487,8 @@ TAO_IIOP_Profile::to_string (void) const ACE_OS::strlen (::the_prefix) /* "iiop" */ + 1 /* colon separator */); - const TAO_IIOP_Endpoint *endp = 0; - for (endp = &this->endpoint_; endp != 0; endp = endp->next_) + const TAO_IIOP_Endpoint *endp = nullptr; + for (endp = &this->endpoint_; endp != nullptr; endp = endp->next_) { buflen += ( pfx_len + @@ -517,7 +512,7 @@ TAO_IIOP_Profile::to_string (void) const ACE_OS::strcpy(buf, "corbaloc:"); - for (endp = &this->endpoint_; endp != 0; endp = endp->next_) + for (endp = &this->endpoint_; endp != nullptr; endp = endp->next_) { if(&this->endpoint_ != endp) ACE_OS::strcat(buf, ","); @@ -561,7 +556,7 @@ TAO_IIOP_Profile::to_string (void) const } const char * -TAO_IIOP_Profile::prefix (void) +TAO_IIOP_Profile::prefix () { return ::the_prefix; } @@ -611,7 +606,7 @@ TAO_IIOP_Profile::create_profile_body (TAO_OutputCDR &encap) const } int -TAO_IIOP_Profile::encode_alternate_endpoints (void) +TAO_IIOP_Profile::encode_alternate_endpoints () { // encode IOP::TAG_ALTERNATE_IIOP_ADDRESS tags if there are more // than one endpoints to listen to. @@ -667,7 +662,7 @@ TAO_IIOP_Profile::encode_alternate_endpoints (void) tagged_component.component_data.get_buffer (); for (const ACE_Message_Block *iterator = out_cdr.begin (); - iterator != 0; + iterator != nullptr; iterator = iterator->cont ()) { size_t i_length = iterator->length (); @@ -684,7 +679,7 @@ TAO_IIOP_Profile::encode_alternate_endpoints (void) } int -TAO_IIOP_Profile::encode_endpoints (void) +TAO_IIOP_Profile::encode_endpoints () { CORBA::ULong actual_count = 0; @@ -756,7 +751,7 @@ TAO_IIOP_Profile::encode_endpoints (void) int -TAO_IIOP_Profile::decode_endpoints (void) +TAO_IIOP_Profile::decode_endpoints () { IOP::TaggedComponent tagged_component; tagged_component.tag = TAO_TAG_ENDPOINTS; @@ -796,7 +791,7 @@ TAO_IIOP_Profile::decode_endpoints (void) i > 0; --i) { - TAO_IIOP_Endpoint *endpoint = 0; + TAO_IIOP_Endpoint *endpoint = nullptr; ACE_NEW_RETURN (endpoint, TAO_IIOP_Endpoint (endpoints[i].host, endpoints[i].port, @@ -834,7 +829,7 @@ TAO_IIOP_Profile::decode_endpoints (void) if (!(in_cdr >> host.out()) || !(in_cdr >> port)) return -1; - TAO_IIOP_Endpoint *endpoint = 0; + TAO_IIOP_Endpoint *endpoint = nullptr; ACE_NEW_RETURN (endpoint, TAO_IIOP_Endpoint (host.in(), port, @@ -846,7 +841,6 @@ TAO_IIOP_Profile::decode_endpoints (void) return 0; } -//@@ TAO_PROFILE_SPL_COPY_HOOK_END TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IIOP_Profile.h b/TAO/tao/IIOP_Profile.h index b4a0a10b527..a3c45dc3fca 100644 --- a/TAO/tao/IIOP_Profile.h +++ b/TAO/tao/IIOP_Profile.h @@ -42,8 +42,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Export TAO_IIOP_Profile : public TAO_Profile { public: - - //@@ TAO_PROFILE_SPL_PUBLIC_METHODS_COPY_HOOK_START static const char object_key_delimiter_; /// Return the char string prefix. @@ -87,8 +85,6 @@ public: /// Add an endpoint when the specific endpoint type is unknown virtual void add_generic_endpoint (TAO_Endpoint *ep); - //@@ TAO_PROFILE_SPL_PUBLIC_METHODS_COPY_HOOK_END - /// The object key delimiter that IIOP uses or expects. virtual char object_key_delimiter (void) const; @@ -130,18 +126,12 @@ protected: * encapsulation of a sequence of structs, each representing a * single endpoint. Data format is specified in iiop_endpoins.pidl. */ - - //@@ TAO_PROFILE_SPL_PROTECTED_METHODS_COPY_HOOK_START - int encode_endpoints_for_rt (void); - //@@ TAO_PROFILE_SPL_PROTECTED_METHODS_COPY_HOOK_END - /// Template methods. Please see Profile.h for the documentation. virtual int decode_profile (TAO_InputCDR &cdr); virtual int decode_endpoints (void); - virtual void parse_string_i (const char *string - ); + virtual void parse_string_i (const char *string); virtual void create_profile_body (TAO_OutputCDR &cdr) const; virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile); @@ -176,9 +166,6 @@ protected: * <encode_endpoints> method documentation above for how the rest of * the endpoint list is transmitted. */ - - //@@ TAO_PROFILE_SPL_PRIVATE_DATA_COPY_HOOK_START - TAO_IIOP_Endpoint endpoint_; /// For efficient insertion at the end of the list @@ -186,8 +173,6 @@ protected: /// Number of endpoints in the list headed by <endpoint_>. CORBA::ULong count_; - - //@@ TAO_PROFILE_SPL_PRIVATE_DATA_COPY_HOOK_END }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp index 9e9318f8489..bb63d2ce313 100644 --- a/TAO/tao/IIOP_Transport.cpp +++ b/TAO/tao/IIOP_Transport.cpp @@ -27,28 +27,18 @@ TAO_IIOP_Transport::TAO_IIOP_Transport (TAO_IIOP_Connection_Handler *handler, { } -TAO_IIOP_Transport::~TAO_IIOP_Transport (void) +TAO_IIOP_Transport::~TAO_IIOP_Transport () { } -/* - * Hook to copy over all concrete implementations - * of Transport class from this class to the base - * class as a part of the specialization. - * All enhancements to the IIOP_Transport - * class, i.e., addition of new concrete non virtual - * methods should be added within this hook. - */ - -//@@ TAO_TRANSPORT_SPL_COPY_HOOK_START ACE_Event_Handler * -TAO_IIOP_Transport::event_handler_i (void) +TAO_IIOP_Transport::event_handler_i () { return this->connection_handler_; } TAO_Connection_Handler * -TAO_IIOP_Transport::connection_handler_i (void) +TAO_IIOP_Transport::connection_handler_i () { return this->connection_handler_; } @@ -92,7 +82,7 @@ TAO_IIOP_Transport::sendfile (TAO_MMAP_Allocator * allocator, // If we don't have an allocator, fallback to the regular way of sending // data - if (allocator == 0) + if (allocator == nullptr) return this->send (iov, iovcnt, bytes_transferred, this->io_timeout(dc)); // We can only use sendfile when all data is coming from the mmap allocator, @@ -217,7 +207,7 @@ TAO_IIOP_Transport::send_request (TAO_Stub *stub, if (this->send_message (stream, stub, - 0, + nullptr, message_semantics, max_wait_time) == -1) { @@ -351,7 +341,7 @@ TAO_IIOP_Transport::get_listen_point ( TAO_IIOP_Acceptor *iiop_acceptor = dynamic_cast<TAO_IIOP_Acceptor *> (acceptor); - if (iiop_acceptor == 0) + if (iiop_acceptor == nullptr) return -1; // Get the array of endpoints serviced by TAO_IIOP_Acceptor @@ -436,10 +426,6 @@ TAO_IIOP_Transport::get_listen_point ( } return 1; } -//@@ TAO_TRANSPORT_SPL_COPY_HOOK_END -/* - * End of copy hook. - */ TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IORInterceptor_Adapter.cpp b/TAO/tao/IORInterceptor_Adapter.cpp index c4b785595ab..48b8f0e9bf6 100644 --- a/TAO/tao/IORInterceptor_Adapter.cpp +++ b/TAO/tao/IORInterceptor_Adapter.cpp @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_IORInterceptor_Adapter::~TAO_IORInterceptor_Adapter (void) +TAO_IORInterceptor_Adapter::~TAO_IORInterceptor_Adapter () { } diff --git a/TAO/tao/IORInterceptor_Adapter.h b/TAO/tao/IORInterceptor_Adapter.h index bfcd27e935e..f85484f38a0 100644 --- a/TAO/tao/IORInterceptor_Adapter.h +++ b/TAO/tao/IORInterceptor_Adapter.h @@ -59,7 +59,7 @@ class TAO_Root_POA; class TAO_Export TAO_IORInterceptor_Adapter { public: - virtual ~TAO_IORInterceptor_Adapter (void); + virtual ~TAO_IORInterceptor_Adapter (); virtual void add_interceptor ( PortableInterceptor::IORInterceptor_ptr interceptor) = 0; @@ -68,7 +68,7 @@ public: PortableInterceptor::IORInterceptor_ptr interceptor, const CORBA::PolicyList& policies) = 0; - virtual void destroy_interceptors (void) = 0; + virtual void destroy_interceptors () = 0; /// Call the IORInterceptor::establish_components() method on all /// registered IORInterceptors. @@ -82,8 +82,7 @@ public: /// Call the IORInterceptor::components_established() method on all /// registered IORInterceptors. - virtual void components_established (PortableInterceptor::IORInfo_ptr info) - = 0; + virtual void components_established (PortableInterceptor::IORInfo_ptr info) = 0; virtual void adapter_state_changed ( const TAO::ObjectReferenceTemplate_Array &array_obj_ref_template, diff --git a/TAO/tao/IORInterceptor_Adapter_Factory.cpp b/TAO/tao/IORInterceptor_Adapter_Factory.cpp index 4a1b09b31b3..280fc46ab4a 100644 --- a/TAO/tao/IORInterceptor_Adapter_Factory.cpp +++ b/TAO/tao/IORInterceptor_Adapter_Factory.cpp @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_IORInterceptor_Adapter_Factory::~TAO_IORInterceptor_Adapter_Factory (void) +TAO_IORInterceptor_Adapter_Factory::~TAO_IORInterceptor_Adapter_Factory () { } diff --git a/TAO/tao/IORManipulation/IORManipulation.cpp b/TAO/tao/IORManipulation/IORManipulation.cpp index 6c86e8fbea0..8eac641e59e 100644 --- a/TAO/tao/IORManipulation/IORManipulation.cpp +++ b/TAO/tao/IORManipulation/IORManipulation.cpp @@ -46,11 +46,7 @@ TAO_IOR_Manipulation_impl::merge_iors ( // get the profile lists, start by initialize the composite reference // by using the first Object. Then for each subsequent Object verify // they are the same type and they do not have duplicate profiles. -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO_MProfile> tmp_pfiles (iors[0]->_stubobj ()->make_profiles ()); -#else - auto_ptr<TAO_MProfile> tmp_pfiles (iors[0]->_stubobj ()->make_profiles ()); -#endif /* ACE_HAS_CPP11 */ if (Merged_Profiles.add_profiles (tmp_pfiles.get ())< 0) throw TAO_IOP::Invalid_IOR (); CORBA::String_var id = @@ -145,11 +141,7 @@ TAO_IOR_Manipulation_impl::remove_profiles ( // initialize with estimated pfile count. TAO_MProfile Diff_Profiles (count); -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO_MProfile> tmp_pfiles (group->_stubobj ()->make_profiles ()); -#else - auto_ptr<TAO_MProfile> tmp_pfiles (group->_stubobj ()->make_profiles ()); -#endif /* ACE_HAS_CPP11 */ if (Diff_Profiles.add_profiles (tmp_pfiles.get ()) < 0) throw TAO_IOP::Invalid_IOR (); @@ -165,8 +157,7 @@ TAO_IOR_Manipulation_impl::remove_profiles ( TAO_ORB_Core *orb_core = TAO_ORB_Core_instance (); TAO_Stub *stub = orb_core->create_stub (id.in (), // give the id string - Diff_Profiles - ); + Diff_Profiles); // Make the stub memory allocation exception safe for the duration // of this method. @@ -278,13 +269,8 @@ TAO_IOR_Manipulation_impl::is_in_ior ( CORBA::ULong count = 0; TAO_Profile *pfile1 = 0; TAO_Profile *pfile2 = 0; -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO_MProfile> tmp_pfiles1 (ior1->_stubobj ()->make_profiles ()); std::unique_ptr<TAO_MProfile> tmp_pfiles2 (ior2->_stubobj ()->make_profiles ()); -#else - auto_ptr<TAO_MProfile> tmp_pfiles1 (ior1->_stubobj ()->make_profiles ()); - auto_ptr<TAO_MProfile> tmp_pfiles2 (ior2->_stubobj ()->make_profiles ()); -#endif /* ACE_HAS_CPP11 */ tmp_pfiles1->rewind (); while ((pfile1 = tmp_pfiles1->get_next ()) != 0) diff --git a/TAO/tao/IOR_Parser.cpp b/TAO/tao/IOR_Parser.cpp index 7049b1b6ff0..cee044f8785 100644 --- a/TAO/tao/IOR_Parser.cpp +++ b/TAO/tao/IOR_Parser.cpp @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_IOR_Parser::~TAO_IOR_Parser (void) +TAO_IOR_Parser::~TAO_IOR_Parser () { } diff --git a/TAO/tao/IOR_Parser.h b/TAO/tao/IOR_Parser.h index 89e112c8547..1ab29881e66 100644 --- a/TAO/tao/IOR_Parser.h +++ b/TAO/tao/IOR_Parser.h @@ -58,8 +58,7 @@ public: * The call may raise the standard system exceptions (NO_MEMORY, * INV_OBJREF, etc.) */ - virtual CORBA::Object_ptr parse_string (const char *ior, CORBA::ORB_ptr orb) - = 0; + virtual CORBA::Object_ptr parse_string (const char *ior, CORBA::ORB_ptr orb) = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Incoming_Message_Queue.cpp b/TAO/tao/Incoming_Message_Queue.cpp index 4b9048426ec..5622b387571 100644 --- a/TAO/tao/Incoming_Message_Queue.cpp +++ b/TAO/tao/Incoming_Message_Queue.cpp @@ -11,7 +11,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Incoming_Message_Queue::~TAO_Incoming_Message_Queue (void) +TAO_Incoming_Message_Queue::~TAO_Incoming_Message_Queue () { CORBA::ULong const sz = this->size_; @@ -27,10 +27,10 @@ TAO_Incoming_Message_Queue::~TAO_Incoming_Message_Queue (void) TAO_Queued_Data * -TAO_Incoming_Message_Queue::dequeue_head (void) +TAO_Incoming_Message_Queue::dequeue_head () { if (this->size_ == 0) - return 0; + return nullptr; // Get the node on the head of the queue... TAO_Queued_Data * const head = this->last_added_->next (); @@ -40,17 +40,17 @@ TAO_Incoming_Message_Queue::dequeue_head (void) // Decrease the size and reset last_added_ if empty if (--this->size_ == 0) - this->last_added_ = 0; + this->last_added_ = nullptr; return head; } TAO_Queued_Data * -TAO_Incoming_Message_Queue::dequeue_tail (void) +TAO_Incoming_Message_Queue::dequeue_tail () { // This is a bit painful stuff... if (this->size_ == 0) - return 0; + return nullptr; // Get the node on the head of the queue... TAO_Queued_Data *head = this->last_added_->next (); @@ -69,7 +69,7 @@ TAO_Incoming_Message_Queue::dequeue_tail (void) // Decrease the size if (--this->size_ == 0) - this->last_added_ = 0; + this->last_added_ = nullptr; return ret_qd; } diff --git a/TAO/tao/Incoming_Message_Queue.h b/TAO/tao/Incoming_Message_Queue.h index 2ad553aad59..fd128efea0c 100644 --- a/TAO/tao/Incoming_Message_Queue.h +++ b/TAO/tao/Incoming_Message_Queue.h @@ -55,15 +55,15 @@ public: TAO_Incoming_Message_Queue (TAO_ORB_Core *orb_core); /// Destructor. - ~TAO_Incoming_Message_Queue (void); + ~TAO_Incoming_Message_Queue (); /// Adding and deleting a node from the queue. - TAO_Queued_Data *dequeue_head (void); - TAO_Queued_Data *dequeue_tail (void); + TAO_Queued_Data *dequeue_head (); + TAO_Queued_Data *dequeue_tail (); int enqueue_tail (TAO_Queued_Data *nd); /// Return the length of the queue.. - CORBA::ULong queue_length (void) const; + CORBA::ULong queue_length () const; private: diff --git a/TAO/tao/Intrusive_Ref_Count_Base_T.h b/TAO/tao/Intrusive_Ref_Count_Base_T.h index c4c6f181b75..69108c9836f 100644 --- a/TAO/tao/Intrusive_Ref_Count_Base_T.h +++ b/TAO/tao/Intrusive_Ref_Count_Base_T.h @@ -20,12 +20,7 @@ #include /**/ "tao/Versioned_Namespace.h" #include "tao/Basic_Types.h" - -#if defined (ACE_HAS_CPP11) -# include <atomic> -#else -# include "ace/Atomic_Op.h" -#endif /* ACE_HAS_CPP11 */ +#include <atomic> TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -43,20 +38,16 @@ template <class ACE_LOCK> class TAO_Intrusive_Ref_Count_Base { public: - virtual ~TAO_Intrusive_Ref_Count_Base (void); + virtual ~TAO_Intrusive_Ref_Count_Base (); - void _add_ref (void); - void _remove_ref (void); + void _add_ref (); + void _remove_ref (); protected: - TAO_Intrusive_Ref_Count_Base (void); + TAO_Intrusive_Ref_Count_Base (); private: -#if defined (ACE_HAS_CPP11) std::atomic<uint32_t> refcount_; -#else - ACE_Atomic_Op<ACE_LOCK, unsigned long> refcount_; -#endif /* ACE_HAS_CPP11 */ // Prevent copying/assignment. TAO_Intrusive_Ref_Count_Base (const TAO_Intrusive_Ref_Count_Base&); diff --git a/TAO/tao/Intrusive_Ref_Count_Handle_T.h b/TAO/tao/Intrusive_Ref_Count_Handle_T.h index 1974d07e2bf..2b293e14b47 100644 --- a/TAO/tao/Intrusive_Ref_Count_Handle_T.h +++ b/TAO/tao/Intrusive_Ref_Count_Handle_T.h @@ -65,7 +65,7 @@ class TAO_Intrusive_Ref_Count_Handle public: /// Default Constructor - enters the "nil" state. - TAO_Intrusive_Ref_Count_Handle (void); + TAO_Intrusive_Ref_Count_Handle (); /// Ctor - By default, takes ownership of passed-in "copy" of reference /// to T. But the second argument (bool) can be changed from @@ -83,7 +83,7 @@ public: TAO_Intrusive_Ref_Count_Handle (const TAO_Intrusive_Ref_Count_Handle& b); /// Destructor - ~TAO_Intrusive_Ref_Count_Handle (void); + ~TAO_Intrusive_Ref_Count_Handle (); /// Assignment Operator with T* argument. /// Takes ownership of passed-in "copy" of reference to T. @@ -99,21 +99,21 @@ public: /// Returns true if underlying pointer is NULL (0). /// Returns false otherwise. - bool is_nil (void) const; + bool is_nil () const; /// Used to pass the underlying pointer as an "IN" argument to a method. - T* in (void) const; + T* in () const; /// Used to pass the underlying pointer as an "IN/OUT" argument to a method. - T*& inout (void); + T*& inout (); /// Used to pass the underlying pointer as an "OUT" argument to a method. - T*& out (void); + T*& out (); /// Used to take-away the underlying pointer from this smart pointer object. /// Caller becomes responsibe for the returned "copy" to the reference. /// Always leaves the smart pointer in the "nil" state upon return. - T* _retn (void); + T* _retn (); /// Equality operator allows the refcounted object to be used generically /// as a contained object @@ -124,14 +124,14 @@ private: /// Claim a "copy" of the reference-counted object by adding /// one to its reference counter. Do nothing if this smart pointer /// object is currently in the "nil" state. - void claim (void); + void claim (); /// Drop our "copy" of the reference-counted object by removing /// one from its reference counter. Do nothing if this smart pointer /// object is currently in the "nil" state. /// Note that this method will always leave this smart pointer /// in the "nil" state upon its return. - void drop (void); + void drop (); /// The underlying pointer to the (intrusively) reference-counted object. /// Set to 0 when this smart pointer is in the "nil" state. Otherwise, diff --git a/TAO/tao/Intrusive_Ref_Count_Object_T.h b/TAO/tao/Intrusive_Ref_Count_Object_T.h index c3429bb15e9..1d97550e93e 100644 --- a/TAO/tao/Intrusive_Ref_Count_Object_T.h +++ b/TAO/tao/Intrusive_Ref_Count_Object_T.h @@ -38,13 +38,13 @@ class TAO_Intrusive_Ref_Count_Object : public TAO_Intrusive_Ref_Count_Base <ACE_ public: /// take ownership of obj. TAO_Intrusive_Ref_Count_Object (OBJ* obj); - virtual ~TAO_Intrusive_Ref_Count_Object (void); + virtual ~TAO_Intrusive_Ref_Count_Object (); OBJ* get () const; private: // Prevent default constructor used. - TAO_Intrusive_Ref_Count_Object (void); + TAO_Intrusive_Ref_Count_Object (); // Prevent copying/assignment. TAO_Intrusive_Ref_Count_Object (const TAO_Intrusive_Ref_Count_Object&); diff --git a/TAO/tao/Invocation_Adapter.cpp b/TAO/tao/Invocation_Adapter.cpp index e9e71701152..78b9eaafbfd 100644 --- a/TAO/tao/Invocation_Adapter.cpp +++ b/TAO/tao/Invocation_Adapter.cpp @@ -25,7 +25,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - Invocation_Adapter::~Invocation_Adapter (void) + Invocation_Adapter::~Invocation_Adapter () { } @@ -63,7 +63,7 @@ namespace TAO // Initial state TAO::Invocation_Status status = TAO_INVOKE_START; - ACE_Time_Value *max_wait_time = 0; + ACE_Time_Value *max_wait_time = nullptr; ACE_Time_Value tmp_wait_time = ACE_Time_Value::zero; if (this->get_timeout (stub, tmp_wait_time)) { @@ -139,11 +139,11 @@ namespace TAO } TAO_Stub * - Invocation_Adapter::get_stub (void) const + Invocation_Adapter::get_stub () const { TAO_Stub * const stub = this->target_->_stubobj (); - if (stub == 0) + if (stub == nullptr) { if (TAO_debug_level > 0) { @@ -365,7 +365,7 @@ namespace TAO { // The object pointer has to be changed to a TAO_Stub pointer // in order to obtain the profiles. - TAO_Stub *stubobj = 0; + TAO_Stub *stubobj = nullptr; bool nil_forward_ref = false; if (CORBA::is_nil (effective_target.in ())) @@ -385,7 +385,7 @@ namespace TAO 0), CORBA::COMPLETED_NO); - if (stubobj == 0) + if (stubobj == nullptr) throw ::CORBA::INTERNAL ( CORBA::SystemException::_tao_minor_code ( TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE, @@ -395,7 +395,7 @@ namespace TAO // Reset the profile in the stubs stub->add_forward_profiles (stubobj->base_profiles (), permanent_forward); - if (stub->next_profile () == 0) + if (stub->next_profile () == nullptr) throw ::CORBA::TRANSIENT ( CORBA::SystemException::_tao_minor_code ( TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE, @@ -409,7 +409,7 @@ namespace TAO TAO::Collocation_Strategy strategy = TAO::TAO_CS_REMOTE_STRATEGY; TAO_Stub *stub = object->_stubobj (); if (!CORBA::is_nil (stub->servant_orb_var ().in ()) && - stub->servant_orb_var ()->orb_core () != 0) + stub->servant_orb_var ()->orb_core () != nullptr) { TAO_ORB_Core *orb_core = stub->servant_orb_var ()->orb_core (); @@ -447,7 +447,7 @@ namespace TAO { if (ACE_BIT_ENABLED (this->collocation_opportunity_, TAO::TAO_CO_DIRECT_STRATEGY) - && (object->_servant () != 0)) + && (object->_servant () != nullptr)) { strategy = TAO::TAO_CS_DIRECT_STRATEGY; } @@ -474,7 +474,7 @@ namespace TAO { if (ACE_BIT_ENABLED (this->collocation_opportunity_, TAO::TAO_CO_DIRECT_STRATEGY) - && (object->_servant () != 0)) + && (object->_servant () != nullptr)) { strategy = TAO::TAO_CS_DIRECT_STRATEGY; } diff --git a/TAO/tao/Invocation_Adapter.h b/TAO/tao/Invocation_Adapter.h index 68e9bc4d40b..9f2304da7f4 100644 --- a/TAO/tao/Invocation_Adapter.h +++ b/TAO/tao/Invocation_Adapter.h @@ -111,7 +111,7 @@ namespace TAO TAO::Invocation_Mode mode = TAO_SYNCHRONOUS_INVOCATION, bool has_in_args = true); - virtual ~Invocation_Adapter (void); + virtual ~Invocation_Adapter (); /// Invoke the target, and used by the generated code. /** @@ -231,7 +231,7 @@ namespace TAO bool get_timeout (TAO_Stub *stub, ACE_Time_Value &val); /// Helper method that extracts TAO_Stub from the target object. - TAO_Stub *get_stub (void) const; + TAO_Stub *get_stub () const; /// Helper method that takes care of setting the profiles within /// the stub object if the target gets forwarded @@ -245,7 +245,7 @@ namespace TAO private: /// Don't allow default initializations - Invocation_Adapter (void); + Invocation_Adapter (); // Prevent copying Invocation_Adapter (Invocation_Adapter const &); diff --git a/TAO/tao/Invocation_Base.cpp b/TAO/tao/Invocation_Base.cpp index 8571d40c0b5..0af8f490d8f 100644 --- a/TAO/tao/Invocation_Base.cpp +++ b/TAO/tao/Invocation_Base.cpp @@ -33,7 +33,7 @@ namespace TAO bool response_expected, bool TAO_INTERCEPTOR (request_is_remote)) : details_ (details) - , forwarded_to_ (0) + , forwarded_to_ (nullptr) , response_expected_ (response_expected) , reply_status_ (GIOP::NO_EXCEPTION) , otarget_ (ot) @@ -44,33 +44,33 @@ namespace TAO , sri_adapter_ (stub_->orb_core ()->serverrequestinterceptor_adapter ()) , stack_size_ (0) , invoke_status_ (TAO_INVOKE_START) - , caught_exception_ (0) + , caught_exception_ (nullptr) , is_remote_request_ (request_is_remote) #endif /* TAO_HAS_INTERCEPTORS == 1 */ { } - Invocation_Base::~Invocation_Base (void) + Invocation_Base::~Invocation_Base () { - TAO_INTERCEPTOR (cri_adapter_= 0); - TAO_INTERCEPTOR (sri_adapter_= 0); + TAO_INTERCEPTOR (cri_adapter_= nullptr); + TAO_INTERCEPTOR (sri_adapter_= nullptr); } TAO_Service_Context & - Invocation_Base::request_service_context (void) + Invocation_Base::request_service_context () { return this->details_.request_service_context (); } TAO_Service_Context & - Invocation_Base::reply_service_context (void) + Invocation_Base::reply_service_context () { return this->details_.reply_service_context (); } #if TAO_HAS_INTERCEPTORS == 1 Invocation_Status - Invocation_Base::send_request_interception (void) + Invocation_Base::send_request_interception () { if (cri_adapter_) { @@ -105,7 +105,7 @@ namespace TAO } Invocation_Status - Invocation_Base::receive_reply_interception (void) + Invocation_Base::receive_reply_interception () { if (cri_adapter_) { @@ -137,7 +137,7 @@ namespace TAO } Invocation_Status - Invocation_Base::receive_other_interception (void) + Invocation_Base::receive_other_interception () { if (cri_adapter_) { @@ -199,7 +199,7 @@ namespace TAO } PortableInterceptor::ReplyStatus - Invocation_Base::handle_all_exception (void) + Invocation_Base::handle_all_exception () { this->exception (&unknown_exception); @@ -224,9 +224,9 @@ namespace TAO void Invocation_Base::exception (CORBA::Exception *exception) { - if (CORBA::SystemException::_downcast (exception) != 0) + if (CORBA::SystemException::_downcast (exception) != nullptr) this->invoke_status_ = TAO::TAO_INVOKE_SYSTEM_EXCEPTION; - else if (CORBA::UserException::_downcast (exception) != 0) + else if (CORBA::UserException::_downcast (exception) != nullptr) this->invoke_status_ = TAO::TAO_INVOKE_USER_EXCEPTION; this->forwarded_to_ = CORBA::Object::_nil (); @@ -235,7 +235,7 @@ namespace TAO } PortableInterceptor::ReplyStatus - Invocation_Base::pi_reply_status (void) const + Invocation_Base::pi_reply_status () const { if (cri_adapter_) { diff --git a/TAO/tao/Invocation_Base.h b/TAO/tao/Invocation_Base.h index 91e2c97e768..c44772a678d 100644 --- a/TAO/tao/Invocation_Base.h +++ b/TAO/tao/Invocation_Base.h @@ -57,11 +57,11 @@ namespace TAO class TAO_Export Invocation_Base { public: - virtual ~Invocation_Base (void); + virtual ~Invocation_Base (); /// Accessor and mutator methods //@{ - TAO_Stub *stub (void) const; + TAO_Stub *stub () const; /// Accessor and mutator methods for forwarded object /// locations. @@ -69,7 +69,7 @@ namespace TAO * These access methods have to be public so that the * PortableInterceptor can use them */ - CORBA::Object_ptr forwarded_reference (void); + CORBA::Object_ptr forwarded_reference (); void forwarded_reference (CORBA::Object_ptr o); /// Accessors for the service context list. @@ -78,33 +78,33 @@ namespace TAO * elsewhere. Providing this accessor helps the PI to access this * list in both remote and collocated mode. */ - TAO_Service_Context &request_service_context (void); - TAO_Service_Context &reply_service_context (void); + TAO_Service_Context &request_service_context (); + TAO_Service_Context &reply_service_context (); /// Return the forwarded object location by loosing ownership. - CORBA::Object_ptr steal_forwarded_reference (void); + CORBA::Object_ptr steal_forwarded_reference (); /// Return the effective target of the invocation. /** * Please see the PortableInterceptor specification in the CORBA * spec to understand what effective target means. */ - CORBA::Object_ptr effective_target (void) const; + CORBA::Object_ptr effective_target () const; /// Return the target object - CORBA::Object_ptr target (void) const; + CORBA::Object_ptr target () const; /// Does this invocation return a response? - CORBA::Boolean response_expected (void) const; + CORBA::Boolean response_expected () const; /// Accessor of reply_status of the invocation. - GIOP::ReplyStatusType reply_status (void) const; + GIOP::ReplyStatusType reply_status () const; /// Mutator of reply_status of the invocation. void reply_status (GIOP::ReplyStatusType s); /// The operaton details of the invocation - TAO_Operation_Details &operation_details (void); + TAO_Operation_Details &operation_details (); //@} protected: @@ -174,19 +174,19 @@ namespace TAO * code must be able to modify this value and use that value * at a later time without being forced to use TSS. */ - size_t &stack_size (void); + size_t &stack_size (); - CORBA::Exception *caught_exception (void); + CORBA::Exception *caught_exception (); /// Change the exception status. void exception (CORBA::Exception *exception); /// Invocation status. - TAO::Invocation_Status invoke_status (void) const; + TAO::Invocation_Status invoke_status () const; /// Mutator to set the invocation status. void invoke_status (Invocation_Status s); - PortableInterceptor::ReplyStatus pi_reply_status (void) const; + PortableInterceptor::ReplyStatus pi_reply_status () const; /// Accessor used to determine if the current invocation is part /// of a remote request, and if not, it will be considered to be @@ -196,22 +196,22 @@ namespace TAO protected: /// Helper method to invoke send_request interception call to all /// the registered interceptors. - Invocation_Status send_request_interception (void); + Invocation_Status send_request_interception (); /// Helper method to invoke receive_reply interception call to all /// the registered interceptors. - Invocation_Status receive_reply_interception (void); + Invocation_Status receive_reply_interception (); /// Helper method to invoke receive_other interception call to all /// the registered interceptors. - Invocation_Status receive_other_interception (void); + Invocation_Status receive_other_interception (); /// Helper methods to handle interception calls when exceptions /// are thrown by the PortableInterceptor. PortableInterceptor::ReplyStatus handle_any_exception (CORBA::Exception * e); - PortableInterceptor::ReplyStatus handle_all_exception (void); + PortableInterceptor::ReplyStatus handle_all_exception (); protected: /// The client requestor adapter diff --git a/TAO/tao/Invocation_Endpoint_Selectors.cpp b/TAO/tao/Invocation_Endpoint_Selectors.cpp index 913169b2ad6..9d4999cbd25 100644 --- a/TAO/tao/Invocation_Endpoint_Selectors.cpp +++ b/TAO/tao/Invocation_Endpoint_Selectors.cpp @@ -10,13 +10,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Invocation_Endpoint_Selector::~TAO_Invocation_Endpoint_Selector (void) +TAO_Invocation_Endpoint_Selector::~TAO_Invocation_Endpoint_Selector () { } // **************************************************************** -TAO_Default_Endpoint_Selector::~TAO_Default_Endpoint_Selector (void) +TAO_Default_Endpoint_Selector::~TAO_Default_Endpoint_Selector () { } @@ -55,7 +55,7 @@ TAO_Default_Endpoint_Selector::select_endpoint (TAO::Profile_Transport_Resolver } for (TAO_Endpoint *ep = r->profile ()->first_filtered_endpoint (); - ep != 0; + ep != nullptr; ep = r->profile ()->next_filtered_endpoint (ep)) { TAO_Base_Transport_Property desc (ep); diff --git a/TAO/tao/Invocation_Retry_Params.cpp b/TAO/tao/Invocation_Retry_Params.cpp index 48519b3ea0f..c900114d007 100644 --- a/TAO/tao/Invocation_Retry_Params.cpp +++ b/TAO/tao/Invocation_Retry_Params.cpp @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO::Invocation_Retry_Params::Invocation_Retry_Params (void) +TAO::Invocation_Retry_Params::Invocation_Retry_Params () : forward_on_reply_closed_limit_ (0) , init_retry_delay_ (0, 100000) // Set default to 0.1 seconds { diff --git a/TAO/tao/LF_CH_Event.cpp b/TAO/tao/LF_CH_Event.cpp index 9c168b12f9c..d3ae6c39d35 100644 --- a/TAO/tao/LF_CH_Event.cpp +++ b/TAO/tao/LF_CH_Event.cpp @@ -6,14 +6,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_LF_CH_Event::TAO_LF_CH_Event (void) +TAO_LF_CH_Event::TAO_LF_CH_Event () : TAO_LF_Event (), prev_state_ (TAO_LF_Event::LFS_IDLE) { } -TAO_LF_CH_Event::~TAO_LF_CH_Event (void) +TAO_LF_CH_Event::~TAO_LF_CH_Event () { } @@ -39,7 +39,7 @@ TAO_LF_CH_Event::state_changed_i (LFS_STATE new_state) if (TAO_debug_level > 9) { size_t id = 0; - TAO_Connection_Handler *ch = 0; + TAO_Connection_Handler *ch = nullptr; if ((ch = dynamic_cast<TAO_Connection_Handler *> (this)) && ch->transport ()) { @@ -109,7 +109,7 @@ TAO_LF_CH_Event::validate_state_change (LFS_STATE new_state) } bool -TAO_LF_CH_Event::successful_i (void) const +TAO_LF_CH_Event::successful_i () const { if (this->prev_state_ == TAO_LF_Event::LFS_CONNECTION_WAIT) return this->state_ == TAO_LF_Event::LFS_SUCCESS; @@ -118,7 +118,7 @@ TAO_LF_CH_Event::successful_i (void) const } bool -TAO_LF_CH_Event::error_detected_i (void) const +TAO_LF_CH_Event::error_detected_i () const { if (this->prev_state_ == TAO_LF_Event::LFS_CONNECTION_WAIT) return this->state_ == TAO_LF_Event::LFS_CONNECTION_CLOSED; @@ -137,7 +137,7 @@ TAO_LF_CH_Event::set_state (LFS_STATE new_state) if (TAO_debug_level > 9) { size_t id = 0; - TAO_Connection_Handler *ch = 0; + TAO_Connection_Handler *ch = nullptr; if ((ch = dynamic_cast<TAO_Connection_Handler *> (this)) && ch->transport ()) { @@ -150,7 +150,7 @@ TAO_LF_CH_Event::set_state (LFS_STATE new_state) } bool -TAO_LF_CH_Event::is_state_final (void) const +TAO_LF_CH_Event::is_state_final () const { return this->state_ == TAO_LF_Event::LFS_CONNECTION_CLOSED; } diff --git a/TAO/tao/LF_Connect_Strategy.cpp b/TAO/tao/LF_Connect_Strategy.cpp index 8bc6dce0c6c..b59e184e042 100644 --- a/TAO/tao/LF_Connect_Strategy.cpp +++ b/TAO/tao/LF_Connect_Strategy.cpp @@ -17,7 +17,7 @@ TAO_LF_Connect_Strategy::TAO_LF_Connect_Strategy (TAO_ORB_Core *orb_core, { } -TAO_LF_Connect_Strategy::~TAO_LF_Connect_Strategy (void) +TAO_LF_Connect_Strategy::~TAO_LF_Connect_Strategy () { } @@ -25,7 +25,7 @@ void TAO_LF_Connect_Strategy::synch_options (ACE_Time_Value *timeout, ACE_Synch_Options &options) { - if (timeout != 0) + if (timeout != nullptr) { options.set (ACE_Synch_Options::USE_REACTOR, *timeout); } @@ -41,7 +41,7 @@ TAO_LF_Connect_Strategy::wait_i (TAO_LF_Event *ev, TAO_Transport *transport, ACE_Time_Value *max_wait_time) { - if (transport == 0) + if (transport == nullptr) return -1; TAO::Nested_Upcall_Guard guard(transport, this->no_upcall_); diff --git a/TAO/tao/LF_Event.cpp b/TAO/tao/LF_Event.cpp index 16139aeb985..d8cf240ce1c 100644 --- a/TAO/tao/LF_Event.cpp +++ b/TAO/tao/LF_Event.cpp @@ -10,13 +10,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_LF_Event::TAO_LF_Event (void) +TAO_LF_Event::TAO_LF_Event () : state_ (TAO_LF_Event::LFS_IDLE) - , follower_ (0) + , follower_ (nullptr) { } -TAO_LF_Event::~TAO_LF_Event (void) +TAO_LF_Event::~TAO_LF_Event () { } @@ -30,7 +30,7 @@ TAO_LF_Event::state_changed (LFS_STATE new_state, TAO_Leader_Follower &lf) this->state_changed_i (new_state); /// Sort of double-checked optimization.. - if (this->follower_ != 0) + if (this->follower_ != nullptr) this->follower_->signal (); } } diff --git a/TAO/tao/LF_Event_Binder.cpp b/TAO/tao/LF_Event_Binder.cpp index 7a052e90f2a..1d916f80544 100644 --- a/TAO/tao/LF_Event_Binder.cpp +++ b/TAO/tao/LF_Event_Binder.cpp @@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_LF_Event_Binder::~TAO_LF_Event_Binder (void) +TAO_LF_Event_Binder::~TAO_LF_Event_Binder () { this->event_->unbind (follower_); } diff --git a/TAO/tao/LF_Follower.cpp b/TAO/tao/LF_Follower.cpp index b1bf0a45bff..9f57ef471d8 100644 --- a/TAO/tao/LF_Follower.cpp +++ b/TAO/tao/LF_Follower.cpp @@ -13,12 +13,12 @@ TAO_LF_Follower::TAO_LF_Follower (TAO_Leader_Follower &leader_follower) { } -TAO_LF_Follower::~TAO_LF_Follower (void) +TAO_LF_Follower::~TAO_LF_Follower () { } int -TAO_LF_Follower::signal (void) +TAO_LF_Follower::signal () { // We *must* remove ourselves from the list of followers, otherwise // we could get signaled twice: to wake up as a follower and as the diff --git a/TAO/tao/LF_Follower_Auto_Adder.cpp b/TAO/tao/LF_Follower_Auto_Adder.cpp index 69e26eb5caf..ec4d4ddd668 100644 --- a/TAO/tao/LF_Follower_Auto_Adder.cpp +++ b/TAO/tao/LF_Follower_Auto_Adder.cpp @@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_LF_Follower_Auto_Adder::~TAO_LF_Follower_Auto_Adder (void) +TAO_LF_Follower_Auto_Adder::~TAO_LF_Follower_Auto_Adder () { this->leader_follower_.remove_follower (this->follower_); } diff --git a/TAO/tao/LF_Follower_Auto_Ptr.cpp b/TAO/tao/LF_Follower_Auto_Ptr.cpp index 87aa0780e6c..6d3adc40080 100644 --- a/TAO/tao/LF_Follower_Auto_Ptr.cpp +++ b/TAO/tao/LF_Follower_Auto_Ptr.cpp @@ -7,7 +7,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_LF_Follower_Auto_Ptr::~TAO_LF_Follower_Auto_Ptr (void) +TAO_LF_Follower_Auto_Ptr::~TAO_LF_Follower_Auto_Ptr () { this->leader_follower_.release_follower (this->follower_); } diff --git a/TAO/tao/LF_Invocation_Event.cpp b/TAO/tao/LF_Invocation_Event.cpp index 16964032c5b..7c627c4cdfb 100644 --- a/TAO/tao/LF_Invocation_Event.cpp +++ b/TAO/tao/LF_Invocation_Event.cpp @@ -3,12 +3,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_LF_Invocation_Event::TAO_LF_Invocation_Event (void) +TAO_LF_Invocation_Event::TAO_LF_Invocation_Event () : TAO_LF_Event () { } -TAO_LF_Invocation_Event::~TAO_LF_Invocation_Event (void) +TAO_LF_Invocation_Event::~TAO_LF_Invocation_Event () { } @@ -62,13 +62,13 @@ TAO_LF_Invocation_Event::state_changed_i (LFS_STATE new_state) } bool -TAO_LF_Invocation_Event::successful_i (void) const +TAO_LF_Invocation_Event::successful_i () const { return this->state_ == TAO_LF_Event::LFS_SUCCESS; } bool -TAO_LF_Invocation_Event::error_detected_i (void) const +TAO_LF_Invocation_Event::error_detected_i () const { return (this->state_ == TAO_LF_Event::LFS_FAILURE || this->state_ == TAO_LF_Event::LFS_TIMEOUT @@ -76,7 +76,7 @@ TAO_LF_Invocation_Event::error_detected_i (void) const } bool -TAO_LF_Invocation_Event::is_state_final (void) const +TAO_LF_Invocation_Event::is_state_final () const { if (this->state_ == TAO_LF_Event::LFS_TIMEOUT || this->state_ == TAO_LF_Event::LFS_FAILURE) diff --git a/TAO/tao/LF_Multi_Event.cpp b/TAO/tao/LF_Multi_Event.cpp index 4d15cfa1e0e..244ea609a55 100644 --- a/TAO/tao/LF_Multi_Event.cpp +++ b/TAO/tao/LF_Multi_Event.cpp @@ -5,16 +5,16 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_LF_Multi_Event::TAO_LF_Multi_Event (void) +TAO_LF_Multi_Event::TAO_LF_Multi_Event () : TAO_LF_Event (), - events_ (0), - winner_ (0) + events_ (nullptr), + winner_ (nullptr) { } -TAO_LF_Multi_Event::~TAO_LF_Multi_Event (void) +TAO_LF_Multi_Event::~TAO_LF_Multi_Event () { - while (this->events_ != 0) + while (this->events_ != nullptr) { Event_Node *n = this->events_->next_; delete this->events_; @@ -30,7 +30,7 @@ TAO_LF_Multi_Event::bind (TAO_LF_Follower *follower) return -1; } - for (Event_Node *n = this->events_; n != 0; n = n->next_) + for (Event_Node *n = this->events_; n != nullptr; n = n->next_) if (n->ptr_->bind(follower) == -1) { return -1; @@ -46,7 +46,7 @@ TAO_LF_Multi_Event::unbind (TAO_LF_Follower *follower) return -1; } - for (Event_Node *n = this->events_; n != 0; n = n->next_) + for (Event_Node *n = this->events_; n != nullptr; n = n->next_) if (n->ptr_->unbind (follower) == -1) { return -1; @@ -58,7 +58,7 @@ TAO_LF_Multi_Event::unbind (TAO_LF_Follower *follower) void TAO_LF_Multi_Event::add_event (TAO_Connection_Handler *ev) { - Event_Node *node = 0; + Event_Node *node = nullptr; ACE_NEW (node, Event_Node); node->next_ = this->events_; node->ptr_ = ev; @@ -67,21 +67,21 @@ TAO_LF_Multi_Event::add_event (TAO_Connection_Handler *ev) } TAO_Connection_Handler* -TAO_LF_Multi_Event::winner (void) +TAO_LF_Multi_Event::winner () { return this->winner_; } TAO_Transport * -TAO_LF_Multi_Event::base_transport (void) +TAO_LF_Multi_Event::base_transport () { - return (this->events_ == 0) ? 0 : this->events_->ptr_->transport(); + return (this->events_ == nullptr) ? nullptr : this->events_->ptr_->transport(); } bool -TAO_LF_Multi_Event::successful_i (void) const +TAO_LF_Multi_Event::successful_i () const { - for (Event_Node *n = this->events_; n != 0; n = n->next_) + for (Event_Node *n = this->events_; n != nullptr; n = n->next_) if (n->ptr_->successful_i()) { this->winner_ = n->ptr_; @@ -91,9 +91,9 @@ TAO_LF_Multi_Event::successful_i (void) const } bool -TAO_LF_Multi_Event::error_detected_i (void) const +TAO_LF_Multi_Event::error_detected_i () const { - for (Event_Node *n = this->events_; n != 0; n = n->next_) + for (Event_Node *n = this->events_; n != nullptr; n = n->next_) { if (!n->ptr_->error_detected_i ()) { @@ -109,9 +109,9 @@ TAO_LF_Multi_Event::state_changed_i (LFS_STATE ) } bool -TAO_LF_Multi_Event::is_state_final (void) const +TAO_LF_Multi_Event::is_state_final () const { - for (Event_Node *n = this->events_; n != 0; n = n->next_) + for (Event_Node *n = this->events_; n != nullptr; n = n->next_) { if (!n->ptr_->is_state_final ()) { diff --git a/TAO/tao/LF_Strategy.cpp b/TAO/tao/LF_Strategy.cpp index 327816a7a94..a1c4293458c 100644 --- a/TAO/tao/LF_Strategy.cpp +++ b/TAO/tao/LF_Strategy.cpp @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_LF_Strategy::~TAO_LF_Strategy (void) +TAO_LF_Strategy::~TAO_LF_Strategy () { } diff --git a/TAO/tao/LF_Strategy_Complete.cpp b/TAO/tao/LF_Strategy_Complete.cpp index 96628848401..1b7d4e4c60c 100644 --- a/TAO/tao/LF_Strategy_Complete.cpp +++ b/TAO/tao/LF_Strategy_Complete.cpp @@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_LF_Strategy_Complete::~TAO_LF_Strategy_Complete (void) +TAO_LF_Strategy_Complete::~TAO_LF_Strategy_Complete () { } diff --git a/TAO/tao/LRU_Connection_Purging_Strategy.cpp b/TAO/tao/LRU_Connection_Purging_Strategy.cpp index 3ed8ef1a4e3..57482d1a29f 100644 --- a/TAO/tao/LRU_Connection_Purging_Strategy.cpp +++ b/TAO/tao/LRU_Connection_Purging_Strategy.cpp @@ -11,7 +11,7 @@ TAO_LRU_Connection_Purging_Strategy::TAO_LRU_Connection_Purging_Strategy ( } -TAO_LRU_Connection_Purging_Strategy::~TAO_LRU_Connection_Purging_Strategy (void) +TAO_LRU_Connection_Purging_Strategy::~TAO_LRU_Connection_Purging_Strategy () { } diff --git a/TAO/tao/Leader_Follower.cpp b/TAO/tao/Leader_Follower.cpp index 62b3527edd8..7baf6687771 100644 --- a/TAO/tao/Leader_Follower.cpp +++ b/TAO/tao/Leader_Follower.cpp @@ -30,7 +30,7 @@ ACE_Event_Handler* TAO_Leader_Follower::Deferred_Event::handler () const return this->eh_.handler (); } -TAO_Leader_Follower::~TAO_Leader_Follower (void) +TAO_Leader_Follower::~TAO_Leader_Follower () { while (!this->deferred_event_set_.is_empty ()) { @@ -49,19 +49,19 @@ TAO_Leader_Follower::~TAO_Leader_Follower (void) else this->orb_core_->resource_factory ()->reclaim_reactor (this->reactor_); - this->reactor_ = 0; + this->reactor_ = nullptr; } TAO_LF_Follower * -TAO_Leader_Follower::allocate_follower (void) +TAO_Leader_Follower::allocate_follower () { if (!this->follower_free_list_.is_empty ()) return this->follower_free_list_.pop_front (); - TAO_LF_Follower* ptr = 0; + TAO_LF_Follower* ptr = nullptr; ACE_NEW_RETURN (ptr, TAO_LF_Follower (*this), - 0); + nullptr); return ptr; } @@ -72,7 +72,7 @@ TAO_Leader_Follower::release_follower (TAO_LF_Follower *follower) } int -TAO_Leader_Follower::elect_new_leader_i (void) +TAO_Leader_Follower::elect_new_leader_i () { TAO_LF_Follower* const follower = this->follower_set_.head (); @@ -97,7 +97,7 @@ TAO_Leader_Follower::wait_for_client_leader_to_complete (ACE_Time_Value *max_wai while (this->client_thread_is_leader_ && result != -1) { - if (max_wait_time == 0) + if (max_wait_time == nullptr) { if (this->event_loop_threads_condition_.wait () == -1) { @@ -134,12 +134,12 @@ TAO_Leader_Follower::wait_for_client_leader_to_complete (ACE_Time_Value *max_wai } ACE_Reactor * -TAO_Leader_Follower::reactor (void) +TAO_Leader_Follower::reactor () { - if (this->reactor_ == 0) + if (this->reactor_ == nullptr) { - ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock (), 0); - if (this->reactor_ == 0) + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock (), nullptr); + if (this->reactor_ == nullptr) { // use GUI reactor factory if available if ( this->orb_core_->gui_resource_factory () ) @@ -154,7 +154,7 @@ TAO_Leader_Follower::reactor (void) } void -TAO_Leader_Follower::set_client_thread (void) +TAO_Leader_Follower::set_client_thread () { // If we were a leader thread or an event loop thread, give up // leadership. @@ -178,7 +178,7 @@ TAO_Leader_Follower::set_client_thread (void) } void -TAO_Leader_Follower::reset_client_thread (void) +TAO_Leader_Follower::reset_client_thread () { // If we were a leader thread or an event loop thread, take back // leadership. @@ -211,7 +211,7 @@ TAO_Leader_Follower::defer_event (ACE_Event_Handler* eh) ACE_TEXT ("TAO (%P|%t) - TAO_Leader_Follower::defer_event, ") ACE_TEXT ("deferring event handler[%d]\n"), eh->get_handle ())); - Deferred_Event* ptr = 0; + Deferred_Event* ptr = nullptr; ACE_NEW_RETURN (ptr, Deferred_Event (eh), -1); @@ -265,7 +265,7 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event, // in PathFinder size_t t_id = 0; - if (TAO_debug_level && transport != 0) + if (TAO_debug_level && transport != nullptr) { t_id = transport->id (); } @@ -283,7 +283,7 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event, // leader loop below can end, other than the event being complete while (event->keep_waiting_i () && !(result == 0 && - max_wait_time != 0 && + max_wait_time != nullptr && *max_wait_time == ACE_Time_Value::zero) && result != -1) { // Scope #2: threads here alternate between being leader/followers @@ -296,7 +296,7 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event, // Grab a follower: TAO_LF_Follower_Auto_Ptr follower (*this); - if (follower.get () == 0) + if (follower.get () == nullptr) return -1; if (TAO_debug_level >= 5) @@ -338,7 +338,7 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event, // lost. TAO_LF_Follower_Auto_Adder auto_adder (*this, follower); - if (max_wait_time == 0) + if (max_wait_time == nullptr) { if (follower->wait (max_wait_time) == -1) { @@ -506,7 +506,7 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event, // Did we timeout? If so, stop running the loop. if (result == 0 && - max_wait_time != 0 && + max_wait_time != nullptr && *max_wait_time == ACE_Time_Value::zero) break; @@ -600,7 +600,7 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event, -1); // Return an error if there was a problem receiving the reply... - if (max_wait_time != 0) + if (max_wait_time != nullptr) { if (!event->successful_i () && *max_wait_time == ACE_Time_Value::zero) diff --git a/TAO/tao/Leader_Follower_Flushing_Strategy.cpp b/TAO/tao/Leader_Follower_Flushing_Strategy.cpp index 0c2763b1a84..ed8f4654227 100644 --- a/TAO/tao/Leader_Follower_Flushing_Strategy.cpp +++ b/TAO/tao/Leader_Follower_Flushing_Strategy.cpp @@ -48,7 +48,7 @@ TAO_Leader_Follower_Flushing_Strategy::flush_transport ( // transport we're coping with here and this thread will block. // Instead we do run for a small amount of time and then recheck // the queue. - if (max_wait_time == 0) + if (max_wait_time == nullptr) { ACE_Errno_Guard eguard (errno); @@ -61,7 +61,7 @@ TAO_Leader_Follower_Flushing_Strategy::flush_transport ( orb_core->orb ()->perform_work (max_wait_time); } - if (max_wait_time != 0) { + if (max_wait_time != nullptr) { if (*max_wait_time <= ACE_Time_Value::zero) { errno = ETIME; return -1; diff --git a/TAO/tao/Load_Protocol_Factory_T.h b/TAO/tao/Load_Protocol_Factory_T.h index 29a2519aa05..af0c7f18731 100644 --- a/TAO/tao/Load_Protocol_Factory_T.h +++ b/TAO/tao/Load_Protocol_Factory_T.h @@ -33,11 +33,7 @@ namespace TAO const char *name) { TAO_Protocol_Factory *protocol_factory = 0; -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO_Protocol_Factory> safe_protocol_factory; -#else - auto_ptr<TAO_Protocol_Factory> safe_protocol_factory; -#endif /* ACE_HAS_CPP11 */ TAO_Protocol_Item *item = 0; diff --git a/TAO/tao/LocalObject.cpp b/TAO/tao/LocalObject.cpp index 9ddb386e204..0d806c12689 100644 --- a/TAO/tao/LocalObject.cpp +++ b/TAO/tao/LocalObject.cpp @@ -13,7 +13,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -CORBA::LocalObject::~LocalObject (void) +CORBA::LocalObject::~LocalObject () { } @@ -50,7 +50,7 @@ CORBA::LocalObject::_is_equivalent (CORBA::Object_ptr other_obj) TAO::ObjectKey * -CORBA::LocalObject::_key (void) +CORBA::LocalObject::_key () { if (TAO_debug_level > 0) TAOLIB_ERROR ((LM_ERROR, @@ -66,14 +66,14 @@ CORBA::LocalObject::_key (void) // the latter case, return FALSE. CORBA::Boolean -CORBA::LocalObject::_non_existent (void) +CORBA::LocalObject::_non_existent () { // Always return false. return false; } char * -CORBA::LocalObject::_repository_id (void) +CORBA::LocalObject::_repository_id () { if (TAO_debug_level > 0) TAOLIB_ERROR ((LM_ERROR, @@ -126,7 +126,7 @@ CORBA::LocalObject::_request (const char *) } CORBA::Object_ptr -CORBA::LocalObject::_get_component (void) +CORBA::LocalObject::_get_component () { if (TAO_debug_level > 0) TAOLIB_ERROR ((LM_ERROR, @@ -136,7 +136,7 @@ CORBA::LocalObject::_get_component (void) } CORBA::InterfaceDef_ptr -CORBA::LocalObject::_get_interface (void) +CORBA::LocalObject::_get_interface () { if (TAO_debug_level > 0) TAOLIB_ERROR ((LM_ERROR, @@ -204,7 +204,7 @@ CORBA::LocalObject::_validate_connection (CORBA::PolicyList_out) #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ CORBA::ORB_ptr -CORBA::LocalObject::_get_orb (void) +CORBA::LocalObject::_get_orb () { if (TAO_debug_level > 0) TAOLIB_ERROR ((LM_ERROR, diff --git a/TAO/tao/LocalObject.h b/TAO/tao/LocalObject.h index 0e11bcd646d..bd6732bd654 100644 --- a/TAO/tao/LocalObject.h +++ b/TAO/tao/LocalObject.h @@ -46,13 +46,13 @@ namespace CORBA public: /// Destructor - virtual ~LocalObject (void); + virtual ~LocalObject (); /// Increment the ref count static LocalObject_ptr _duplicate (LocalObject_ptr obj); /// Return a NIL object - static LocalObject_ptr _nil (void); + static LocalObject_ptr _nil (); /** * @todo Narrowing a LocalObject to a CORBA::Object is broken @@ -66,17 +66,17 @@ namespace CORBA #if (TAO_HAS_MINIMUM_CORBA == 0) /// Always returns false. - virtual CORBA::Boolean _non_existent (void); + virtual CORBA::Boolean _non_existent (); /// Get the repository id. - virtual char * _repository_id (void); + virtual char * _repository_id (); #if ! defined (CORBA_E_COMPACT) && ! defined (CORBA_E_MICRO) /// Gets info about object from the Interface Repository. - virtual CORBA::InterfaceDef_ptr _get_interface (void); + virtual CORBA::InterfaceDef_ptr _get_interface (); /// Throws NO_IMPLEMENT. - virtual CORBA::Object_ptr _get_component (void); + virtual CORBA::Object_ptr _get_component (); virtual void _create_request (CORBA::Context_ptr ctx, const char * operation, @@ -139,12 +139,12 @@ namespace CORBA */ virtual CORBA::Boolean _is_equivalent (CORBA::Object_ptr other_obj); - virtual CORBA::ORB_ptr _get_orb (void); + virtual CORBA::ORB_ptr _get_orb (); // = TAO extensions /// Throws CORBA::NO_IMPLEMENT. - virtual TAO::ObjectKey * _key (void); + virtual TAO::ObjectKey * _key (); /// Useful for template programming. typedef LocalObject_ptr _ptr_type; @@ -156,7 +156,7 @@ namespace CORBA /** * Make it protected to prevent instantiation of this class. */ - LocalObject (void); + LocalObject (); private: /** diff --git a/TAO/tao/LocateRequest_Invocation.cpp b/TAO/tao/LocateRequest_Invocation.cpp index deff77755ff..55fba329255 100644 --- a/TAO/tao/LocateRequest_Invocation.cpp +++ b/TAO/tao/LocateRequest_Invocation.cpp @@ -34,7 +34,7 @@ namespace TAO public: First_Request_Guard (TAO_Transport &transport); - ~First_Request_Guard (void); + ~First_Request_Guard (); private: /// The transport that we guard. @@ -50,7 +50,7 @@ namespace TAO this->is_first_ = this->transport_.first_request (); } - First_Request_Guard::~First_Request_Guard (void) + First_Request_Guard::~First_Request_Guard () { this->transport_.first_request_sent (this->is_first_); } @@ -71,7 +71,7 @@ namespace TAO { TAO::ORB_Countdown_Time countdown (max_wait_time); - TAO_Synch_Reply_Dispatcher *rd_p = 0; + TAO_Synch_Reply_Dispatcher *rd_p = nullptr; ACE_NEW_NORETURN (rd_p, TAO_Synch_Reply_Dispatcher (this->resolver_.stub ()->orb_core (), this->details_.reply_service_info ())); if (!rd_p) @@ -148,7 +148,7 @@ namespace TAO TAO_InputCDR &cdr = rd.reply_cdr (); // Set the translators - this->resolver_.transport ()->assign_translators (&cdr, 0); + this->resolver_.transport ()->assign_translators (&cdr, nullptr); switch (rd.locate_reply_status ()) { diff --git a/TAO/tao/LocateRequest_Invocation_Adapter.cpp b/TAO/tao/LocateRequest_Invocation_Adapter.cpp index 531dba39b28..e7920ac5439 100644 --- a/TAO/tao/LocateRequest_Invocation_Adapter.cpp +++ b/TAO/tao/LocateRequest_Invocation_Adapter.cpp @@ -18,19 +18,19 @@ namespace TAO LocateRequest_Invocation_Adapter::LocateRequest_Invocation_Adapter ( CORBA::Object_ptr target) : target_ (target) - , list_ (0) + , list_ (nullptr) { } void - LocateRequest_Invocation_Adapter::invoke (void) + LocateRequest_Invocation_Adapter::invoke () { CORBA::Object_var effective_target = CORBA::Object::_duplicate (this->target_); TAO_Stub * const stub = this->target_->_stubobj (); - if (stub == 0) + if (stub == nullptr) throw ::CORBA::INTERNAL ( CORBA::SystemException::_tao_minor_code ( 0, @@ -45,7 +45,7 @@ namespace TAO ACE_Service_Config_Guard scg (stub->orb_core ()->configuration ()); ACE_Time_Value tmp_wait_time; - ACE_Time_Value *max_wait_time = 0; + ACE_Time_Value *max_wait_time = nullptr; if (this->get_timeout (tmp_wait_time)) max_wait_time = &tmp_wait_time; @@ -70,7 +70,7 @@ namespace TAO // Dummy operation details that is used to instantiate the // LocateRequest class. - TAO_Operation_Details op (0, 0); + TAO_Operation_Details op (nullptr, 0); op.request_id (resolver.transport ()->tms ()->request_id ()); TAO::LocateRequest_Invocation synch (this->target_, resolver, op); @@ -101,7 +101,7 @@ namespace TAO } CORBA::PolicyList * - LocateRequest_Invocation_Adapter::get_inconsistent_policies (void) + LocateRequest_Invocation_Adapter::get_inconsistent_policies () { return this->list_._retn (); } @@ -125,7 +125,7 @@ namespace TAO { // The object pointer has to be changed to a TAO_Stub pointer // in order to obtain the profiles. - TAO_Stub *stubobj = 0; + TAO_Stub *stubobj = nullptr; bool nil_forward_ref = false; if (CORBA::is_nil (effective_target.in ())) @@ -146,7 +146,7 @@ namespace TAO 0), CORBA::COMPLETED_NO); - if (stubobj == 0) + if (stubobj == nullptr) throw ::CORBA::INTERNAL ( CORBA::SystemException::_tao_minor_code ( TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE, @@ -156,7 +156,7 @@ namespace TAO // Reset the profile in the stubs stub->add_forward_profiles (stubobj->base_profiles (), permanent_forward); - if (stub->next_profile () == 0) + if (stub->next_profile () == nullptr) throw ::CORBA::TRANSIENT ( CORBA::SystemException::_tao_minor_code ( TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE, diff --git a/TAO/tao/MCAST_Parser.cpp b/TAO/tao/MCAST_Parser.cpp index 5eda8d95184..101a9c54238 100644 --- a/TAO/tao/MCAST_Parser.cpp +++ b/TAO/tao/MCAST_Parser.cpp @@ -21,7 +21,7 @@ static const char mcast_prefix[] = "mcast:"; TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_MCAST_Parser::~TAO_MCAST_Parser (void) +TAO_MCAST_Parser::~TAO_MCAST_Parser () { } @@ -247,13 +247,13 @@ TAO_MCAST_Parser::multicast_query (char* & buf, result)); // Wait for response until timeout. ACE_Time_Value tv ( - timeout == 0 + timeout == nullptr ? ACE_Time_Value (TAO_DEFAULT_SERVICE_RESOLUTION_TIMEOUT) : *timeout); // Accept reply connection from server. if (acceptor.accept (stream, - 0, + nullptr, &tv) == -1) { if (TAO_debug_level > 0) @@ -293,7 +293,7 @@ TAO_MCAST_Parser::multicast_query (char* & buf, if (ior_len >= TAO_DEFAULT_IOR_SIZE) { buf = CORBA::string_alloc (ior_len); - if (buf == 0) + if (buf == nullptr) { if (TAO_debug_level > 0) { diff --git a/TAO/tao/MMAP_Allocator.cpp b/TAO/tao/MMAP_Allocator.cpp index aca4124f7b1..04453f7cd8d 100644 --- a/TAO/tao/MMAP_Allocator.cpp +++ b/TAO/tao/MMAP_Allocator.cpp @@ -54,20 +54,20 @@ namespace // read(2)) for the open()ed /dev/zero device. Reading through the // /dev/zero file descriptor simply returns zero, as /dev/zero was // designed to do. So unfortunate. :) -TAO_MMAP_Allocator::TAO_MMAP_Allocator (void) - : TAO_MMAP_Allocator_Base ((char const *) 0 /* pool name */, - 0, // No need to explicitly name the lock. +TAO_MMAP_Allocator::TAO_MMAP_Allocator () + : TAO_MMAP_Allocator_Base ((char const *) nullptr /* pool name */, + nullptr, // No need to explicitly name the lock. &the_pool_options) { } -TAO_MMAP_Allocator::~TAO_MMAP_Allocator (void) +TAO_MMAP_Allocator::~TAO_MMAP_Allocator () { } // @@ Should be const but underlying allocator methods are not! ACE_HANDLE -TAO_MMAP_Allocator::handle (void) +TAO_MMAP_Allocator::handle () { return this->alloc ().memory_pool ().mmap ().handle (); } diff --git a/TAO/tao/MMAP_Allocator.h b/TAO/tao/MMAP_Allocator.h index 07c5aa64c11..2967593191a 100644 --- a/TAO/tao/MMAP_Allocator.h +++ b/TAO/tao/MMAP_Allocator.h @@ -44,7 +44,6 @@ class TAO_MMAP_Allocator : public TAO_MMAP_Allocator_Base { public: - /// Constructor TAO_MMAP_Allocator (void); @@ -59,11 +58,10 @@ public: off_t offset (void * p); private: - - // Disallow copying. - TAO_MMAP_Allocator (TAO_MMAP_Allocator const &); - void operator= (TAO_MMAP_Allocator const &); - + TAO_MMAP_Allocator (TAO_MMAP_Allocator const &) = delete; + void operator= (TAO_MMAP_Allocator const &) = delete; + TAO_MMAP_Allocator (TAO_MMAP_Allocator &&) = delete; + void operator= (TAO_MMAP_Allocator &&) = delete; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/MM_Sequence_Iterator_T.h b/TAO/tao/MM_Sequence_Iterator_T.h deleted file mode 100644 index f71cd34f8fb..00000000000 --- a/TAO/tao/MM_Sequence_Iterator_T.h +++ /dev/null @@ -1,957 +0,0 @@ -#ifndef mm_sequence_iterator_h -#define mm_sequence_iterator_h - -/** - * @file - * - * @brief Implement the iterator for CORBA sequences that need - * memory management. - * - * There are some CORBA sequences that need to manage memory (e.g., - * string sequences). Iterators for these classes also need to - * manage memory and therefore do not use the iterators defined - * for the generic sequences. - * - * Essentially, only the iterators operators that reference and return - * elements (e.g.,operator*, operator[]) need to be overridden from the - * behavior provided by the generic sequence iterators. Template - * specialization code is appropriate here but I couldn't figure out how - * to make the compiler happy. - * - * In lieu of template specialization code separate iterators exist - * for sequences that manage memory. Here are those iterators. - * - * @author Joe Hoffert - */ - -#if defined TAO_HAS_SEQUENCE_ITERATORS && TAO_HAS_SEQUENCE_ITERATORS == 1 - -namespace TAO -{ - -// Forward declare the iterators -template<typename T> -class MM_Sequence_Iterator; - -template<typename T> -class Const_MM_Sequence_Iterator; - -template<typename T> -class MM_Sequence_Reverse_Iterator; - -template<typename T> -class Const_MM_Sequence_Reverse_Iterator; - - -/** - * @class MM_Sequence_Iterator - * @brief Implements a random access iterator for generic sequence type - * classes that need to manage memory. MM stands for memory managed. - */ -template <typename SEQUENCE_T> - class MM_Sequence_Iterator -{ - friend class Const_MM_Sequence_Iterator<SEQUENCE_T>; - -public: - // = Necessary traits - typedef std::random_access_iterator_tag iterator_category; - typedef typename SEQUENCE_T::value_type value_type; - typedef typename SEQUENCE_T::value_type *pointer; - typedef typename SEQUENCE_T::value_type &reference; - typedef typename SEQUENCE_T::element_type element_type; - typedef typename SEQUENCE_T::const_element_type const_element_type; - typedef typename SEQUENCE_T::allocation_traits allocation_traits; - typedef typename SEQUENCE_T::element_traits element_traits; - typedef typename SEQUENCE_T::implementation_type implementation_type; - typedef CORBA::Long difference_type; - - /// Construct a MM_Sequence_Iterator at position pos. - MM_Sequence_Iterator (implementation_type *sequence, - size_t pos = 0) - : sequence_ (sequence), - pos_ (pos) - { - } - - /// Copy constructor - MM_Sequence_Iterator (MM_Sequence_Iterator<SEQUENCE_T> const & rhs) - : sequence_ (rhs.sequence_), - pos_ (rhs.pos_) - { - } - - /// Assignment operator - MM_Sequence_Iterator & operator= (MM_Sequence_Iterator<SEQUENCE_T> const & rhs) - { - MM_Sequence_Iterator tmp(rhs); - swap (tmp); - return * this; - } - - /// swaps all members - void swap(MM_Sequence_Iterator<SEQUENCE_T> & rhs) - throw() - { - std::swap (sequence_, rhs.sequence_); - std::swap (this->pos_, rhs.pos_); - } - - /// typecast operator to Const_MM_Sequence_Iterator - operator Const_MM_Sequence_Iterator<SEQUENCE_T> () - { - return Const_MM_Sequence_Iterator<SEQUENCE_T> (*this); - } - - /// Dereference operator returns a reference to the item contained - /// at the current position - element_type operator* (void) - { - // Access the underlying element in the sequence. - return element_type ((*(this->sequence_))[this->pos_], - this->sequence_->release ()); - } - - /// Returns a const reference to the item contained at the current position - const_element_type operator* (void) const - { - // Access the underlying element in the sequence. - return const_element_type ((*(this->sequence_))[this->pos_], - this->sequence_->release ()); - } - - /// Preincrement operator - MM_Sequence_Iterator<SEQUENCE_T> &operator++ (void) - { - // Increment the position. - // We also need to check if we're now past the end. - ++this->pos_; - return *this; - } - - /// Postincrement operator - MM_Sequence_Iterator<SEQUENCE_T> operator++ (int) - { - // Create a temporary to return so that it's not modified. - MM_Sequence_Iterator<SEQUENCE_T> temp_iter (this->sequence_, this->pos_); - // Increment the position. - // We also need to check if we're now past the end. - ++this->pos_; - return temp_iter; - } - - /// Predecrement operator - MM_Sequence_Iterator<SEQUENCE_T> &operator-- (void) - { - --this->pos_; - return *this; - } - - /// Postdecrement operator - MM_Sequence_Iterator<SEQUENCE_T> operator-- (int) - { - // Create a temporary to return so that it's not modified. - MM_Sequence_Iterator<SEQUENCE_T> temp_iter (this->sequence_, this->pos_); - --this->pos_; - return temp_iter; - } - - /// Iterator addition - MM_Sequence_Iterator<SEQUENCE_T> &operator+= (difference_type n) - { - // Move ahead n elements. - this->pos_ += n; - return *this; - } - - /// Iterator addition - MM_Sequence_Iterator<SEQUENCE_T> operator+ (difference_type n) - { - // Create a temporary to return and move it ahead n elements. - return MM_Sequence_Iterator<SEQUENCE_T> (this->sequence_, this->pos_ + n); - } - - /// Iterator subtraction - MM_Sequence_Iterator<SEQUENCE_T> &operator-= (difference_type n) - { - // Move back n elements. - this->pos_ -= n; - return *this; - } - - /// Iterator subtraction - MM_Sequence_Iterator<SEQUENCE_T> operator- (difference_type n) - { - // Create a temporary to return and move it back n elements. - return MM_Sequence_Iterator<SEQUENCE_T> (this->sequence_, this->pos_ - n); - } - - /// Difference - difference_type operator- (const MM_Sequence_Iterator<SEQUENCE_T> & rhs) - { - // I think order is important here (i.e., this before rhs). - return this->pos_ - rhs.pos_; - } - - /// Difference - difference_type operator- (const Const_MM_Sequence_Iterator<SEQUENCE_T> & rhs) - { - // I think order is important here (i.e., this before rhs). - return this->pos_ - rhs.pos_; - } - - /// Element operator/assignment - element_type operator[] (difference_type n) - { - // Return the element at position pos_ + n - return element_type ((*(this->sequence_))[this->pos_ + n], - this->sequence_->release ()); - } - - /// Element operator/assignment - const_element_type operator[] (difference_type n) const - { - // Return the element at position pos_ + n - return const_element_type ((*(this->sequence_))[this->pos_ + n], - this->sequence_->release ()); - } - - /// Less than - bool operator< (const MM_Sequence_Iterator<SEQUENCE_T> & rhs) - { - // Return if this iterator is less than the passed in iterator. - return this->pos_ < rhs.pos_; - } - - /// Less than - bool operator< (const Const_MM_Sequence_Iterator<SEQUENCE_T> & rhs) - { - // Return if this iterator is less than the passed in iterator. - return this->pos_ < rhs.pos_; - } - - - /// Equality operator - bool operator== (const MM_Sequence_Iterator<SEQUENCE_T> &rhs) const - { - // Compare all the data members for equality. - return this->sequence_ == rhs.sequence_ - && this->pos_ == rhs.pos_; - } - - /// Nonequality operator - bool operator!= (const MM_Sequence_Iterator<SEQUENCE_T> &rhs) const - { - return !(*this == rhs); - } - -private: - /// the sequence with which we are dealing - implementation_type *sequence_; - - /// Our current position in the sequence. - mutable difference_type pos_; -}; - - -/// Iterator addition with the difference_type being the first argument. -template<typename SEQUENCE_T> - MM_Sequence_Iterator<SEQUENCE_T> - operator+ (typename MM_Sequence_Iterator<SEQUENCE_T>::difference_type n, - const MM_Sequence_Iterator<SEQUENCE_T> & iter) - { - // Create an iter and move it ahead n elements. - return MM_Sequence_Iterator<SEQUENCE_T> (iter.sequence_, iter.pos_ + n); - } - -/// Iterator subtraction with the difference_type being the first argument. -template<typename SEQUENCE_T> - MM_Sequence_Iterator<SEQUENCE_T> operator- - (typename MM_Sequence_Iterator<SEQUENCE_T>::difference_type n, - MM_Sequence_Iterator<SEQUENCE_T> iter) - { - // Create an iter and move it back n elements. - return MM_Sequence_Iterator<SEQUENCE_T> (iter.sequence_, iter.pos_ - n); - } - - -/** - * @class Const_MM_Sequence_Iterator - * @brief Implements a constant random access iterator for generic sequence - * type classes that need to manage memory. MM stands for memory - * managed. - * - * Note: Having a const Iterator does not guarantee that the current - * *position* that it points to will not change, it only guarantees that - * you cannot change the underlying array! - */ -template <typename SEQUENCE_T> -class Const_MM_Sequence_Iterator -{ - friend class MM_Sequence_Iterator<SEQUENCE_T>; - -public: - // = Necessary traits - typedef std::random_access_iterator_tag iterator_category; - typedef typename SEQUENCE_T::value_type value_type; - typedef typename SEQUENCE_T::value_type *pointer; - typedef typename SEQUENCE_T::value_type &reference; - typedef typename SEQUENCE_T::const_element_type const_element_type; - typedef typename SEQUENCE_T::allocation_traits allocation_traits; - typedef typename SEQUENCE_T::element_traits element_traits; - typedef typename SEQUENCE_T::implementation_type implementation_type; - typedef int difference_type; - - /// Construct a Const_MM_Sequence_Iterator at position pos from - /// a const sequence. - explicit Const_MM_Sequence_Iterator (const implementation_type *sequence, - size_t pos = 0) - : sequence_ (sequence), - pos_ (pos) - { - } - - virtual ~Const_MM_Sequence_Iterator () - { - } - - /// Copy constructor - Const_MM_Sequence_Iterator ( - Const_MM_Sequence_Iterator<SEQUENCE_T> const & rhs) - : sequence_ (rhs.sequence_), - pos_ (rhs.pos_) - { - } - - /// Copy constructor initializing by a MM_Sequence_Iterator - explicit Const_MM_Sequence_Iterator ( - MM_Sequence_Iterator<SEQUENCE_T> const & rhs) - : sequence_ (rhs.sequence_), - pos_ (rhs.pos_) - { - } - - /// Assignment operator - Const_MM_Sequence_Iterator & operator= ( - Const_MM_Sequence_Iterator<SEQUENCE_T> const & rhs) - { - Const_MM_Sequence_Iterator tmp(rhs); - swap (tmp); - return * this; - } - - /// swaps all members - void swap(Const_MM_Sequence_Iterator<SEQUENCE_T> & rhs) - throw() - { - std::swap (sequence_, rhs.sequence_); - std::swap (this->pos_, rhs.pos_); - } - - /// Dereference operator returns a reference to the item contained - /// at the current position - const_element_type operator* (void) const - { - // Access the underlying element in the sequence. - return const_element_type ((*(this->sequence_))[this->pos_], - this->sequence_->release ()); - } - - /// Preincrement operator - const Const_MM_Sequence_Iterator<SEQUENCE_T> &operator++ (void) const - { - // Increment the position. - ++this->pos_; - return * this; - } - - /// Postincrement operator - Const_MM_Sequence_Iterator<SEQUENCE_T> operator++ (int) const - { - // Create a temporary to return so that it's not modified. - Const_MM_Sequence_Iterator<SEQUENCE_T> temp_iter (this->sequence_, this->pos_); - // Increment the position. - // We also need to check if we're now past the end. - ++this->pos_; - return temp_iter; - } - - /// Predecrement operator - const Const_MM_Sequence_Iterator<SEQUENCE_T> &operator-- (void) const - { - --this->pos_; - return * this; - } - - /// Postdecrement operator - Const_MM_Sequence_Iterator<SEQUENCE_T> operator-- (int) const - { - // Create a temporary to return so that it's not modified. - Const_MM_Sequence_Iterator<SEQUENCE_T> temp_iter (this->sequence_, this->pos_); - --this->pos_; - return temp_iter; - } - - /// Iterator addition - const Const_MM_Sequence_Iterator<SEQUENCE_T> &operator+= (difference_type n) const - { - // Move ahead n elements. - this->pos_ += n; - return * this; - } - - /// Iterator addition - Const_MM_Sequence_Iterator<SEQUENCE_T> operator+ (difference_type n) const - { - // Create a temporary to return and move it ahead n elements. - return Const_MM_Sequence_Iterator<SEQUENCE_T> (this->sequence_, this->pos_ + n); - } - - /// Iterator subtraction - const Const_MM_Sequence_Iterator<SEQUENCE_T> &operator-= (difference_type n) const - { - // Move back n elements. - this->pos_ -= n; - return * this; - } - - /// Iterator subtraction - Const_MM_Sequence_Iterator<SEQUENCE_T> operator- (difference_type n) const - { - // Create a temporary to return and move it back n elements. - return Const_MM_Sequence_Iterator<SEQUENCE_T> (this->sequence_, this->pos_ - n); - } - - /// Difference - difference_type operator- (const Const_MM_Sequence_Iterator<SEQUENCE_T> & rhs) const - { - // I think the order is important here (i.e., this before rhs). - return this->pos_ - rhs.pos_; - } - - /// Element operator - const_element_type operator[] (difference_type n) const - { - // Return the element at position pos_ + n - return const_element_type ((*(this->sequence_))[this->pos_ + n], - this->sequence_->release ()); - } - - /// Less than - virtual bool operator< (const Const_MM_Sequence_Iterator<SEQUENCE_T> & rhs) const - { - // Return if this iterator is less than the passed in iterator. - return this->pos_ < rhs.pos_; - } - - /// Equality operator - bool operator== (const Const_MM_Sequence_Iterator<SEQUENCE_T> &rhs) const - { - // Compare all the data members for equality. - return this->sequence_ == rhs.sequence_ - && this->pos_ == rhs.pos_; - } - - /// Nonequality operator - bool operator!= (const Const_MM_Sequence_Iterator<SEQUENCE_T> &rhs) const - { - return !(*this == rhs); - } - -private: - /// the sequence with which we are dealing - const implementation_type *sequence_; - - /// Our current position in the sequence. - mutable difference_type pos_; -}; - -/// Iterator addition with the difference_type being the first argument. -template<typename SEQUENCE_T> - Const_MM_Sequence_Iterator<SEQUENCE_T> operator+ - (typename MM_Sequence_Iterator<SEQUENCE_T>::difference_type n, - Const_MM_Sequence_Iterator<SEQUENCE_T> iter) - { - // Create an iter and move it ahead n elements. - return Const_MM_Sequence_Iterator<SEQUENCE_T> (iter.sequence_, iter.pos_ + n); - } - -/// Iterator subtraction with the difference_type being the first argument. -template<typename SEQUENCE_T> - Const_MM_Sequence_Iterator<SEQUENCE_T> operator- - (typename MM_Sequence_Iterator<SEQUENCE_T>::difference_type n, - Const_MM_Sequence_Iterator<SEQUENCE_T> iter) - { - // Create an iter and move it back n elements. - return Const_MM_Sequence_Iterator<SEQUENCE_T> (iter.sequence_, iter.pos_ - n); - } - - -/** - * @class MM_Sequence_Reverse_Iterator - * @brief Implements a reverse random access iterator for generic sequence type - * classes that need to manage memory. MM stands for memory managed. - */ -template <typename SEQUENCE_T> -class MM_Sequence_Reverse_Iterator -{ - friend class Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T>; - -public: - // = Necessary traits - typedef std::random_access_iterator_tag iterator_category; - typedef typename SEQUENCE_T::value_type value_type; - typedef typename SEQUENCE_T::value_type *pointer; - typedef typename SEQUENCE_T::value_type &reference; - typedef typename SEQUENCE_T::element_type element_type; - typedef typename SEQUENCE_T::const_element_type const_element_type; - typedef typename SEQUENCE_T::allocation_traits allocation_traits; - typedef typename SEQUENCE_T::element_traits element_traits; - typedef typename SEQUENCE_T::implementation_type implementation_type; - typedef int difference_type; - - /// Construct a MM_Sequence_Reverse_Iterator at position pos - MM_Sequence_Reverse_Iterator (implementation_type *sequence, - size_t pos) - : sequence_ (sequence), - pos_ (pos) - { - } - - /// Copy constructor - MM_Sequence_Reverse_Iterator ( - MM_Sequence_Reverse_Iterator<SEQUENCE_T> const & rhs) - : sequence_ (rhs.sequence_), - pos_ (rhs.pos_) - { - } - - /// Assignment operator - MM_Sequence_Reverse_Iterator & operator= ( - MM_Sequence_Reverse_Iterator<SEQUENCE_T> const & rhs) - { - MM_Sequence_Reverse_Iterator tmp(rhs); - swap (tmp); - return * this; - } - - /// swaps all members - void swap(MM_Sequence_Reverse_Iterator<SEQUENCE_T> & rhs) - throw() - { - std::swap (sequence_, rhs.sequence_); - std::swap (this->pos_, rhs.pos_); - } - - /// Dereference operator returns a reference to the item contained - /// at the current position - element_type operator* (void) - { - // Access the underlying element in the sequence. - return element_type ((*(this->sequence_))[this->pos_], - this->sequence_->release ()); - } - - /// Returns a const reference to the item contained at the current position - const_element_type operator* (void) const - { - // Access the underlying element in the sequence. - return const_element_type ((*(this->sequence_))[this->pos_], - this->sequence_->release ()); - } - - /// Preincrement operator - MM_Sequence_Reverse_Iterator<SEQUENCE_T> &operator++ (void) - { - // Decrement the position for reverse iterators. - // We also need to check if we're now before the start. - --this->pos_; - return *this; - } - - /// Postincrement operator - MM_Sequence_Reverse_Iterator<SEQUENCE_T> operator++ (int) - { - // Create a temporary to return so that it's not modified. - MM_Sequence_Reverse_Iterator<SEQUENCE_T> temp_iter (this->sequence_, this->pos_); - // Decrement the position for reverse iterators. - // We also need to check if we're now past the end. - --this->pos_; - return temp_iter; - } - - /// Predecrement operator - MM_Sequence_Reverse_Iterator<SEQUENCE_T> &operator-- (void) - { - // Increment the position for reverse iterators. - ++this->pos_; - return *this; - } - - /// Postdecrement operator - MM_Sequence_Reverse_Iterator<SEQUENCE_T> operator-- (int) - { - // Create a temporary to return so that it's not modified. - MM_Sequence_Reverse_Iterator<SEQUENCE_T> temp_iter (this->sequence_, this->pos_); - // Increment the position for reverse iterators. - ++this->pos_; - return temp_iter; - } - - /// Iterator addition - MM_Sequence_Reverse_Iterator<SEQUENCE_T> &operator+= (difference_type n) - { - // Move back n elements for reverse iterators. - this->pos_ -= n; - return *this; - } - - /// Iterator addition - MM_Sequence_Reverse_Iterator<SEQUENCE_T> operator+ (difference_type n) - { - // Create a temporary to return and move it back n elements for - // reverse iterators. - return MM_Sequence_Reverse_Iterator<SEQUENCE_T> (this->sequence_, this->pos_ - n); - } - - /// Iterator subtraction - MM_Sequence_Reverse_Iterator<SEQUENCE_T> &operator-= (difference_type n) - { - // Move ahead n elements for reverse iterators. - this->pos_ += n; - return *this; - } - - /// Iterator subtraction - MM_Sequence_Reverse_Iterator<SEQUENCE_T> operator- (difference_type n) - { - // Create a temporary to return and move it ahead n elements for - // reverse iterators. - return MM_Sequence_Reverse_Iterator<SEQUENCE_T> (this->sequence_, this->pos_ + n); - } - - /// Difference - difference_type operator- (const MM_Sequence_Reverse_Iterator<SEQUENCE_T> & rhs) - { - // I think order is important here (i.e., rhs before this). - return rhs.pos_ - this->pos_; - } - - /// Difference - difference_type operator- (const Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> & rhs) - { - // I think order is important here (i.e., rhs before this). - return rhs.pos_ - this->pos_; - } - - /// Element operator/assignment - element_type operator[] (difference_type n) - { - // Return the element at position pos_ + n - return element_type ((*(this->sequence_))[this->pos_ + n], - this->sequence_->release ()); - } - - /// Element operator/assignment - const_element_type operator[] (difference_type n) const - { - // Return the element at position pos_ + n - return const_element_type ((*(this->sequence_))[this->pos_ + n], - this->sequence_->release ()); - } - - /// Less than - bool operator< (const MM_Sequence_Reverse_Iterator<SEQUENCE_T> & rhs) - { - // Return if this iterator is less than the passed in iterator. - // For reverse iterators reverse the logic. - return this->pos_ > rhs.pos_; - } - - /// Less than - bool operator< (const Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> & rhs) - { - // Return if this iterator is less than the passed in iterator. - // For reverse iterators reverse the logic. - return this->pos_ > rhs.pos_; - } - - - /// Equality operator - bool operator== (const MM_Sequence_Reverse_Iterator<SEQUENCE_T> &rhs) const - { - // Compare all the data members for equality. - return this->sequence_ == rhs.sequence_ - && this->pos_ == rhs.pos_; - } - - /// Equality operator - bool operator== (const Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> &rhs) const - { - // Compare all the data members for equality. - return this->sequence_ == rhs.sequence_ - && this->pos_ == rhs.pos_; - } - - /// Nonequality operator - bool operator!= (const MM_Sequence_Reverse_Iterator<SEQUENCE_T> &rhs) const - { - return !(*this == rhs); - } - - /// Nonequality operator - bool operator!= (const Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> &rhs) const - { - return !(*this == rhs); - } - -private: - /// The sequence with which we are dealing - implementation_type *sequence_; - - /// Our current position in the sequence. - mutable difference_type pos_; -}; - -/// Iterator addition with the difference_type being the first argument. -template<typename SEQUENCE_T> - MM_Sequence_Reverse_Iterator<SEQUENCE_T> operator+ - (typename MM_Sequence_Reverse_Iterator<SEQUENCE_T>::difference_type n, - MM_Sequence_Reverse_Iterator<SEQUENCE_T> iter) - { - // Create an iter and move it back n elements for reverse iterators. - return MM_Sequence_Reverse_Iterator<SEQUENCE_T> (iter.sequence_, iter.pos_ - n); - } - -/// Iterator subtraction with the difference_type being the first argument. -template<typename SEQUENCE_T> - MM_Sequence_Reverse_Iterator<SEQUENCE_T> operator- - (typename MM_Sequence_Reverse_Iterator<SEQUENCE_T>::difference_type n, - MM_Sequence_Reverse_Iterator<SEQUENCE_T> iter) - { - // Create an iter and move it ahead n elements for reverse iterators. - return MM_Sequence_Reverse_Iterator<SEQUENCE_T> (iter.sequence_, iter.pos_ + n); - } - - -/** - * @class Const_MM_Sequence_Reverse_Iterator - * @brief Implements a constant reverse random access iterator for generic - * sequence type classes that need to manage memory. MM stands for - * memory managed. - * - * Note: Having a const Iterator does not guarantee that the current - * *position* that it points to will not change, it only guarantees that - * you cannot change the underlying array! - */ -template <typename SEQUENCE_T> -class Const_MM_Sequence_Reverse_Iterator -{ - friend class MM_Sequence_Reverse_Iterator<SEQUENCE_T>; - -public: - // = Necessary traits - typedef std::random_access_iterator_tag iterator_category; - typedef typename SEQUENCE_T::value_type value_type; - typedef typename SEQUENCE_T::value_type *pointer; - typedef typename SEQUENCE_T::value_type &reference; - typedef typename SEQUENCE_T::const_element_type const_element_type; - typedef typename SEQUENCE_T::allocation_traits allocation_traits; - typedef typename SEQUENCE_T::element_traits element_traits; - typedef typename SEQUENCE_T::implementation_type implementation_type; - typedef int difference_type; - - /// Construct a Const_MM_Sequence_Reverse_Iterator at position pos - /// using a const sequence. - Const_MM_Sequence_Reverse_Iterator (const implementation_type *sequence, - size_t pos) - : sequence_ (sequence), - pos_ (pos) - { - } - - /// Copy constructor - Const_MM_Sequence_Reverse_Iterator ( - Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> const & rhs) - : sequence_ (rhs.sequence_), - pos_ (rhs.pos_) - { - } - - /// Copy constructor - Const_MM_Sequence_Reverse_Iterator ( - MM_Sequence_Reverse_Iterator<SEQUENCE_T> const & rhs) - : sequence_ (rhs.sequence_), - pos_ (rhs.pos_) - { - } - - /// Assignment operator - Const_MM_Sequence_Reverse_Iterator & operator= ( - Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> const & rhs) - { - Const_MM_Sequence_Reverse_Iterator tmp(rhs); - swap (tmp); - return * this; - } - - /// swaps all members - void swap(Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> & rhs) - throw() - { - std::swap (sequence_, rhs.sequence_); - std::swap (this->pos_, rhs.pos_); - } - - /// typecast operator to MM_Sequence_Reverse_Iterator - - /// Dereference operator returns a reference to the item contained - /// at the current position - const_element_type operator* (void) const - { - // Access the underlying element in the sequence. - return const_element_type ((*(this->sequence_))[this->pos_], - this->sequence_->release ()); - } - - /// Preincrement operator - const Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> &operator++ (void) const - { - // Decrement the position for reveres iterators. - // We also need to check if we're now before the start. - --this->pos_; - return *this; - } - - /// Postincrement operator - Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> operator++ (int) const - { - // Create a temporary to return so that it's not modified. - Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> temp_iter (this->sequence_, this->pos_); - // Decrement the position for reverse iterators. - // We also need to check if we're now before the start. - --this->pos_; - return temp_iter; - } - - /// Predecrement operator - const Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> &operator-- (void) const - { - // Increment the position for reverse iterators. - ++this->pos_; - return *this; - } - - /// Postdecrement operator - Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> operator-- (int) const - { - // Create a temporary to return so that it's not modified. - Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> temp_iter (this->sequence_, this->pos_); - // Increment the position for reverse iterators. - ++this->pos_; - return temp_iter; - } - - /// Iterator addition - const Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> &operator+= (difference_type n) const - { - // Move back n elements for reverse iterators. - this->pos_ -= n; - return *this; - } - - /// Iterator addition - Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> operator+ (difference_type n) const - { - // Create a temporary to return and move it back n elements for - // reverse iterators. - return Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> (this->sequence_, this->pos_ - n); - } - - /// Iterator subtraction - const Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> &operator-= (difference_type n) const - { - // Move ahead n elements for reverse iterators. - this->pos_ += n; - return *this; - } - - /// Iterator subtraction - Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> operator- (difference_type n) const - { - // Create a temporary to return and move it ahead n elements for - // reverse iterators. - return Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> (this->sequence_, this->pos_ + n); - } - - /// Difference - difference_type operator- (const Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> & rhs) const - { - // I think order is important here (i.e., rhs before this). - return rhs.pos_ - this->pos_; - } - - /// Element operator/assignment - const_element_type operator[] (difference_type n) const - { - // Return the element at position pos_ + n - return const_element_type ((*(this->sequence_))[this->pos_ + n], - this->sequence_->release ()); - } - - /// Less than - bool operator< (const Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> & rhs) const - { - // Return if this iterator is less than the passed in iterator. - // For reverse iterators reverse the logic. - return this->pos_ > rhs.pos_; - } - - /// Equality operator - bool operator== (const Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> &rhs) const - { - // Compare all the data members for equality. - return this->sequence_ == rhs.sequence_ - && this->pos_ == rhs.pos_; - } - - /// Nonequality operator - bool operator!= (const Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> &rhs) const - { - return !(*this == rhs); - } - -private: - /// the sequence with which we are dealing - const implementation_type *sequence_; - - /// Our current position in the sequence. - mutable difference_type pos_; -}; - -/// Iterator addition with the difference_type being the first argument. -template<typename SEQUENCE_T> - Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> operator+ - (typename Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T>::difference_type n, - Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> iter) - { - // Create an iter and move it back n elements for reverse iterators. - return Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> (iter.sequence_, iter.pos_ - n); - } - -/// Iterator subtraction with the difference_type being the first argument. -template<typename SEQUENCE_T> - Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> operator- - (typename Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T>::difference_type n, - Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> iter) - { - // Create an iter and move it ahead n elements for reverse iterators. - return Const_MM_Sequence_Reverse_Iterator<SEQUENCE_T> (iter.sequence_, iter.pos_ + n); - } - - -} // namespace TAO - -#endif /* TAO_HAS_SEQUENCE_ITERATORS == 1 */ - -#endif // mm_sequence_iterator_h diff --git a/TAO/tao/MProfile.cpp b/TAO/tao/MProfile.cpp index cfadbaed48d..a8590c3d08a 100644 --- a/TAO/tao/MProfile.cpp +++ b/TAO/tao/MProfile.cpp @@ -15,9 +15,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_MProfile::~TAO_MProfile (void) +TAO_MProfile::~TAO_MProfile () { - if (this->policy_list_ != 0) + if (this->policy_list_ != nullptr) { CORBA::ULong const len = this->policy_list_->length (); for (CORBA::ULong i = 0; i < len; ++i) @@ -41,15 +41,15 @@ TAO_MProfile::~TAO_MProfile (void) } void -TAO_MProfile::cleanup (void) +TAO_MProfile::cleanup () { - if (this->pfiles_ != 0) + if (this->pfiles_ != nullptr) { for (TAO_PHandle i = 0; i < this->last_; ++i) if (this->pfiles_[i]) this->pfiles_[i]->_decr_refcnt (); delete [] this->pfiles_; - this->pfiles_ = 0; + this->pfiles_ = nullptr; } this->current_ = 0; @@ -78,7 +78,7 @@ TAO_MProfile::set (CORBA::ULong sz) if (this->pfiles_[h]) { this->pfiles_[h]->_decr_refcnt (); - this->pfiles_[h] = 0; + this->pfiles_[h] = nullptr; } // Next see if we can reuse our profile list memory @@ -107,7 +107,7 @@ TAO_MProfile::set (CORBA::ULong sz) this->current_ = 0; for (TAO_PHandle i = 0; i != this->size_; ++i) - this->pfiles_[i] = 0; + this->pfiles_[i] = nullptr; return this->size_; } @@ -132,7 +132,7 @@ TAO_MProfile::set (const TAO_MProfile &mprofile) for (TAO_PHandle h = 0; h < this->last_; ++h) { this->pfiles_[h] = mprofile.pfiles_[h]; - if (this->pfiles_[h] != 0) + if (this->pfiles_[h] != nullptr) this->pfiles_[h]->_incr_refcnt (); } @@ -147,8 +147,8 @@ TAO_MProfile::grow (CORBA::ULong sz) return 0; // get the additional space - TAO_Profile **new_pfiles = 0; - TAO_Profile **old_pfiles = 0; + TAO_Profile **new_pfiles = nullptr; + TAO_Profile **old_pfiles = nullptr; ACE_NEW_RETURN (new_pfiles, TAO_Profile *[sz], -1); @@ -159,7 +159,7 @@ TAO_MProfile::grow (CORBA::ULong sz) for (TAO_PHandle h = 0; h < this->size_; ++h) { new_pfiles[h] = old_pfiles[h]; - old_pfiles[h] = 0; + old_pfiles[h] = nullptr; } this->pfiles_ = new_pfiles; @@ -235,7 +235,7 @@ TAO_MProfile::remove_profile (const TAO_Profile *pfile) if (this->pfiles_[h]->is_equivalent (pfile)) { // remove it! TAO_Profile *old = this->pfiles_[h]; - this->pfiles_[h] = 0; + this->pfiles_[h] = nullptr; old->_decr_refcnt (); // shift other profiles up one // note, if h == last_ - 1 then do nothing. @@ -300,17 +300,16 @@ TAO_MProfile::hash (CORBA::ULong max) } void -TAO_MProfile::create_policy_list (void) +TAO_MProfile::create_policy_list () { ACE_NEW_THROW_EX (this->policy_list_, CORBA::PolicyList, CORBA::NO_MEMORY (0, - CORBA::COMPLETED_NO) - ); + CORBA::COMPLETED_NO)); } void -TAO_MProfile::init_policy_list (void) +TAO_MProfile::init_policy_list () { // The first time this method is called // it causes the initialization of the policies @@ -322,23 +321,23 @@ TAO_MProfile::init_policy_list (void) } CORBA::PolicyList * -TAO_MProfile::policy_list (void) +TAO_MProfile::policy_list () { if (!this->is_policy_list_initialized_) { ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->mutex_, - 0); + nullptr); - if (this->policy_list_ == 0) + if (this->policy_list_ == nullptr) { this->create_policy_list (); this->init_policy_list (); } } - CORBA::PolicyList *ret_val = 0; + CORBA::PolicyList *ret_val = nullptr; ACE_NEW_THROW_EX (ret_val, CORBA::PolicyList (*this->policy_list_), CORBA::NO_MEMORY (0, diff --git a/TAO/tao/MProfile.h b/TAO/tao/MProfile.h index 7d3aa640e01..d00ce8384b7 100644 --- a/TAO/tao/MProfile.h +++ b/TAO/tao/MProfile.h @@ -69,7 +69,7 @@ public: /// Destructor: decrements reference count on all references /// profiles! - ~TAO_MProfile (void); + ~TAO_MProfile (); /// Inits MProfile to hold sz TAO_Profiles. /// NOT THREAD SAFE @@ -88,20 +88,20 @@ public: int grow (CORBA::ULong sz); /// Treat as a circular list. - TAO_Profile *get_cnext (void); + TAO_Profile *get_cnext (); /// Get next profile in list, return 0 at end of list. - TAO_Profile *get_next (void); + TAO_Profile *get_next (); /// Assume a circular list of profiles. - TAO_Profile *get_cprev (void); + TAO_Profile *get_cprev (); /// Get previous profile, stop at beginning of list and return 0. - TAO_Profile *get_prev (void); + TAO_Profile *get_prev (); /// Return a pointer to the current profile, will not increment /// reference pointer. - TAO_Profile *get_current_profile (void); + TAO_Profile *get_current_profile (); /// Return a pointer to the profile referenced by handle void. TAO_Profile *get_profile (TAO_PHandle handle); @@ -109,24 +109,24 @@ public: // rem_profile (TAO_PHandle handle); let's wait. /// Returns the index for the current profile. - TAO_PHandle get_current_handle (void); + TAO_PHandle get_current_handle (); /// Returns the index for the current profile. - TAO_PHandle get_current_handle (void) const; + TAO_PHandle get_current_handle () const; /// Returns the number of profiles stored in the list (last_+1). - CORBA::ULong profile_count (void) const; + CORBA::ULong profile_count () const; /// return the maximum number of profiles that can be stored in this /// container, (size_+1) - CORBA::ULong size (void) const; + CORBA::ULong size () const; /// Return the profile at position <slot>. If <slot> is out of range /// it returns 0. const TAO_Profile* get_profile (CORBA::ULong slot) const; /// Sets the current slot back to 0. - void rewind (void); + void rewind (); /// Return the index of this entry or -1 if it can not be added. /// reference count on profile in incremented! @@ -151,7 +151,7 @@ public: void forward_from (TAO_MProfile *mprofiles); /// Returns a pointer to the profile which was forwarded. - TAO_MProfile *forward_from (void); + TAO_MProfile *forward_from (); /** * Returns true of there is at least one profile in first which @@ -171,7 +171,7 @@ public: protected: /// This method handle the dynamic allocation of the data member /// <policy_list_>. - void create_policy_list (void); + void create_policy_list (); public: /// Sets the policies list associated with the profiles @@ -180,11 +180,11 @@ public: /// Gets the policies list associated with the profiles /// owned by the TAO_MProfile. - CORBA::PolicyList *policy_list (void); + CORBA::PolicyList *policy_list (); protected: /// Initialize the policy list, demarsharling the policy. - void init_policy_list (void); + void init_policy_list (); protected: /// Stores the policy list for the profile of this MProfile. @@ -200,12 +200,12 @@ protected: protected: /// Return the complete list of profiles, this object retains /// ownership! - TAO_Profile **pfiles (void) const; + TAO_Profile **pfiles () const; private: /// Helper method to implement the destructor - void cleanup (void); + void cleanup (); /// A helper to give_profile to be used when share is true. This /// method is used primarily to help the corbaloc parser create a diff --git a/TAO/tao/Messaging/AMH_Response_Handler.cpp b/TAO/tao/Messaging/AMH_Response_Handler.cpp index ed3b08b2b17..f1ab26afb16 100644 --- a/TAO/tao/Messaging/AMH_Response_Handler.cpp +++ b/TAO/tao/Messaging/AMH_Response_Handler.cpp @@ -29,7 +29,7 @@ TAO_AMH_Response_Handler::TAO_AMH_Response_Handler () { } -TAO_AMH_Response_Handler::~TAO_AMH_Response_Handler (void) +TAO_AMH_Response_Handler::~TAO_AMH_Response_Handler () { this->transport_->remove_reference (); @@ -86,7 +86,7 @@ TAO_AMH_Response_Handler::init(TAO_ServerRequest &server_request, } void -TAO_AMH_Response_Handler::_tao_rh_init_reply (void) +TAO_AMH_Response_Handler::_tao_rh_init_reply () { { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); @@ -126,7 +126,7 @@ TAO_AMH_Response_Handler::_tao_rh_init_reply (void) } void -TAO_AMH_Response_Handler::_tao_rh_send_reply (void) +TAO_AMH_Response_Handler::_tao_rh_send_reply () { { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); @@ -311,7 +311,7 @@ TAO_AMH_Response_Handler::_tao_rh_send_location_forward (CORBA::Object_ptr fwd, } void -TAO_AMH_Response_Handler::_remove_ref (void) +TAO_AMH_Response_Handler::_remove_ref () { if (--this->refcount_ == 0) { diff --git a/TAO/tao/Messaging/AMH_Response_Handler.h b/TAO/tao/Messaging/AMH_Response_Handler.h index 703728eba77..a7fbfbcbe69 100644 --- a/TAO/tao/Messaging/AMH_Response_Handler.h +++ b/TAO/tao/Messaging/AMH_Response_Handler.h @@ -74,7 +74,7 @@ public: * Releases the transport and in case of an error, sends the appropriate * exception back to the client */ - virtual ~TAO_AMH_Response_Handler (void); + virtual ~TAO_AMH_Response_Handler (); /** * Stores necessary information from a TAO_Server_Request onto the heap @@ -84,17 +84,17 @@ public: /// @name Mutators for refcount //@{ - virtual void _remove_ref (void); + virtual void _remove_ref (); //@} protected: /// Sets up the various parameters in anticipation of returning a reply /// to the client. return/OUT/INOUT arguments are marshalled into the /// Output stream after this method has been called. - void _tao_rh_init_reply (void); + void _tao_rh_init_reply (); /// Sends the marshalled reply back to the client. - void _tao_rh_send_reply (void); + void _tao_rh_send_reply (); /// Send back an exception to the client. void _tao_rh_send_exception (const CORBA::Exception &ex); diff --git a/TAO/tao/Messaging/AMH_Skeletons.cpp b/TAO/tao/Messaging/AMH_Skeletons.cpp index f2781a1b81e..284ad831305 100644 --- a/TAO/tao/Messaging/AMH_Skeletons.cpp +++ b/TAO/tao/Messaging/AMH_Skeletons.cpp @@ -22,7 +22,7 @@ #include "tao/TAO_Server_Request.h" void -_is_a_amh_Upcall_Command::execute (void) +_is_a_amh_Upcall_Command::execute () { TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> ( @@ -83,7 +83,7 @@ TAO_AMH_Skeletons::_is_a_amh_skel (TAO_ServerRequest & server_request, #if (TAO_HAS_MINIMUM_CORBA == 0) void -_non_existent_amh_Upcall_Command::execute (void) +_non_existent_amh_Upcall_Command::execute () { TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> ( @@ -163,7 +163,7 @@ TAO_AMH_Skeletons::_interface_amh_skel (TAO_ServerRequest & server_request, } void -_get_component_amh_Upcall_Command::execute (void) +_get_component_amh_Upcall_Command::execute () { TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval = TAO::Portable_Server::get_ret_arg< ::CORBA::Object> ( @@ -214,7 +214,7 @@ TAO_AMH_Skeletons::_component_amh_skel (TAO_ServerRequest & server_request, void -_repository_id_amh_Upcall_Command::execute (void) +_repository_id_amh_Upcall_Command::execute () { TAO::SArg_Traits< char *>::ret_arg_type retval = TAO::Portable_Server::get_ret_arg< char *> ( diff --git a/TAO/tao/Messaging/AMH_Skeletons.h b/TAO/tao/Messaging/AMH_Skeletons.h index 3157a9c6793..fa6aa742f03 100644 --- a/TAO/tao/Messaging/AMH_Skeletons.h +++ b/TAO/tao/Messaging/AMH_Skeletons.h @@ -61,7 +61,7 @@ public: , args_ (args) {} - virtual void execute (void); + virtual void execute (); private: TAO_ServantBase * const servant_; @@ -89,7 +89,7 @@ public: { } - virtual void execute (void); + virtual void execute (); private: TAO_ServantBase * const servant_; TAO_Operation_Details const * const operation_details_; @@ -116,7 +116,7 @@ public: { } - virtual void execute (void); + virtual void execute (); private: TAO_ServantBase * const servant_; @@ -144,7 +144,7 @@ public: { } - virtual void execute (void); + virtual void execute (); private: TAO_ServantBase * const servant_; diff --git a/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp b/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp index d47234ebb0d..ff0302be5d1 100644 --- a/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp +++ b/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp @@ -120,7 +120,7 @@ TAO_AMI_Arguments_Converter_Impl::handle_corba_exception ( // Initialization and registration of dynamic service object. int -TAO_AMI_Arguments_Converter_Impl::Initializer (void) +TAO_AMI_Arguments_Converter_Impl::Initializer () { return ACE_Service_Config::process_directive ( ace_svc_desc_TAO_AMI_Arguments_Converter_Impl); diff --git a/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.h b/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.h index 6f0ebd8cb1f..59a5ead3ebc 100644 --- a/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.h +++ b/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.h @@ -58,7 +58,7 @@ public: CORBA::Exception *exception); // Used to force the initialization of the ORB code. - static int Initializer (void); + static int Initializer (); }; static int diff --git a/TAO/tao/Messaging/Asynch_Invocation_Adapter.h b/TAO/tao/Messaging/Asynch_Invocation_Adapter.h index c6af67798b7..7175889b3a4 100644 --- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.h +++ b/TAO/tao/Messaging/Asynch_Invocation_Adapter.h @@ -94,7 +94,7 @@ namespace TAO private: /// Don't allow default initializations - Asynch_Invocation_Adapter (void); + Asynch_Invocation_Adapter (); Asynch_Invocation_Adapter (const Asynch_Invocation_Adapter &); Asynch_Invocation_Adapter & operator= (const Asynch_Invocation_Adapter &); diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp index 31e20589456..a85a96033e8 100644 --- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp +++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp @@ -23,7 +23,7 @@ TAO_Asynch_Reply_Dispatcher::TAO_Asynch_Reply_Dispatcher ( } // Destructor. -TAO_Asynch_Reply_Dispatcher::~TAO_Asynch_Reply_Dispatcher (void) +TAO_Asynch_Reply_Dispatcher::~TAO_Asynch_Reply_Dispatcher () { } @@ -147,7 +147,7 @@ TAO_Asynch_Reply_Dispatcher::dispatch_reply (TAO_Pluggable_Reply_Params ¶ms) } void -TAO_Asynch_Reply_Dispatcher::connection_closed (void) +TAO_Asynch_Reply_Dispatcher::connection_closed () { try { @@ -196,7 +196,7 @@ TAO_Asynch_Reply_Dispatcher::connection_closed (void) // AMI Timeout Handling Begin void -TAO_Asynch_Reply_Dispatcher::reply_timed_out (void) +TAO_Asynch_Reply_Dispatcher::reply_timed_out () { try { diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h index 392487aa8a4..9ecb3b3abb5 100644 --- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h +++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h @@ -42,17 +42,17 @@ public: ACE_Allocator *allocator); /// Destructor. - virtual ~TAO_Asynch_Reply_Dispatcher (void); + virtual ~TAO_Asynch_Reply_Dispatcher (); /// @name The Reply Dispatcher methods //@{ virtual int dispatch_reply (TAO_Pluggable_Reply_Params ¶ms); - virtual void connection_closed (void); + virtual void connection_closed (); //@} /// Inform that the reply timed out - virtual void reply_timed_out (void); + virtual void reply_timed_out (); /// Install the timeout handler long schedule_timer (CORBA::ULong request_id, diff --git a/TAO/tao/Messaging/Buffering_Constraint_Policy.cpp b/TAO/tao/Messaging/Buffering_Constraint_Policy.cpp index f6f4993050e..ed468eb16fa 100644 --- a/TAO/tao/Messaging/Buffering_Constraint_Policy.cpp +++ b/TAO/tao/Messaging/Buffering_Constraint_Policy.cpp @@ -31,7 +31,7 @@ TAO_Buffering_Constraint_Policy::TAO_Buffering_Constraint_Policy (const TAO_Buff } CORBA::PolicyType -TAO_Buffering_Constraint_Policy::policy_type (void) +TAO_Buffering_Constraint_Policy::policy_type () { return TAO::BUFFERING_CONSTRAINT_POLICY_TYPE; } @@ -53,7 +53,7 @@ TAO_Buffering_Constraint_Policy::create (const CORBA::Any& val) TAO_Buffering_Constraint_Policy * -TAO_Buffering_Constraint_Policy::clone (void) const +TAO_Buffering_Constraint_Policy::clone () const { TAO_Buffering_Constraint_Policy *copy = 0; ACE_NEW_RETURN (copy, @@ -63,13 +63,13 @@ TAO_Buffering_Constraint_Policy::clone (void) const } TAO::BufferingConstraint -TAO_Buffering_Constraint_Policy::buffering_constraint (void) +TAO_Buffering_Constraint_Policy::buffering_constraint () { return this->buffering_constraint_; } CORBA::Policy_ptr -TAO_Buffering_Constraint_Policy::copy (void) +TAO_Buffering_Constraint_Policy::copy () { TAO_Buffering_Constraint_Policy* servant = 0; ACE_NEW_THROW_EX (servant, @@ -80,12 +80,12 @@ TAO_Buffering_Constraint_Policy::copy (void) } void -TAO_Buffering_Constraint_Policy::destroy (void) +TAO_Buffering_Constraint_Policy::destroy () { } TAO_Cached_Policy_Type -TAO_Buffering_Constraint_Policy::_tao_cached_type (void) const +TAO_Buffering_Constraint_Policy::_tao_cached_type () const { return TAO_CACHED_POLICY_BUFFERING_CONSTRAINT; } diff --git a/TAO/tao/Messaging/Buffering_Constraint_Policy.h b/TAO/tao/Messaging/Buffering_Constraint_Policy.h index 63e207ab560..f65dc35667f 100644 --- a/TAO/tao/Messaging/Buffering_Constraint_Policy.h +++ b/TAO/tao/Messaging/Buffering_Constraint_Policy.h @@ -54,22 +54,22 @@ public: static CORBA::Policy_ptr create (const CORBA::Any& val); /// Returns a copy of @c this. - virtual TAO_Buffering_Constraint_Policy *clone (void) const; + virtual TAO_Buffering_Constraint_Policy *clone () const; // = The TAO::Buffering_Constraint_Policy methods - virtual TAO::BufferingConstraint buffering_constraint (void); + virtual TAO::BufferingConstraint buffering_constraint (); void get_buffering_constraint (TAO::BufferingConstraint &) const; - virtual CORBA::PolicyType policy_type (void); + virtual CORBA::PolicyType policy_type (); - virtual CORBA::Policy_ptr copy (void); + virtual CORBA::Policy_ptr copy (); - virtual void destroy (void); + virtual void destroy (); /// Return the cached policy type for this policy. - virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; + virtual TAO_Cached_Policy_Type _tao_cached_type () const; private: /// The attribute diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp index ee9cbf65964..d8ebe3a5c3d 100644 --- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp +++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp @@ -32,13 +32,13 @@ TAO_ConnectionTimeoutPolicy::TAO_ConnectionTimeoutPolicy ( } TimeBase::TimeT -TAO_ConnectionTimeoutPolicy::relative_expiry (void) +TAO_ConnectionTimeoutPolicy::relative_expiry () { return this->relative_expiry_; } CORBA::PolicyType -TAO_ConnectionTimeoutPolicy::policy_type (void) +TAO_ConnectionTimeoutPolicy::policy_type () { return TAO::CONNECTION_TIMEOUT_POLICY_TYPE; } @@ -119,7 +119,7 @@ TAO_ConnectionTimeoutPolicy::create (const CORBA::Any& val) } TAO_ConnectionTimeoutPolicy * -TAO_ConnectionTimeoutPolicy::clone (void) const +TAO_ConnectionTimeoutPolicy::clone () const { TAO_ConnectionTimeoutPolicy *copy = 0; ACE_NEW_RETURN (copy, @@ -129,7 +129,7 @@ TAO_ConnectionTimeoutPolicy::clone (void) const } CORBA::Policy_ptr -TAO_ConnectionTimeoutPolicy::copy (void) +TAO_ConnectionTimeoutPolicy::copy () { // Future policy implementors: notice how the following code is // exception safe! @@ -143,12 +143,12 @@ TAO_ConnectionTimeoutPolicy::copy (void) } void -TAO_ConnectionTimeoutPolicy::destroy (void) +TAO_ConnectionTimeoutPolicy::destroy () { } TAO_Cached_Policy_Type -TAO_ConnectionTimeoutPolicy::_tao_cached_type (void) const +TAO_ConnectionTimeoutPolicy::_tao_cached_type () const { return TAO_CACHED_POLICY_CONNECTION_TIMEOUT; } diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h b/TAO/tao/Messaging/Connection_Timeout_Policy_i.h index 839d5024450..02a182a3a54 100644 --- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h +++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.h @@ -64,22 +64,22 @@ public: static CORBA::Policy_ptr create (const CORBA::Any& val); /// Returns a copy of <this>. - virtual TAO_ConnectionTimeoutPolicy *clone (void) const; + virtual TAO_ConnectionTimeoutPolicy *clone () const; // = The TAO::ConnectionTinoutPolicy methods - virtual TimeBase::TimeT relative_expiry (void); + virtual TimeBase::TimeT relative_expiry (); - virtual CORBA::PolicyType policy_type (void); + virtual CORBA::PolicyType policy_type (); - virtual CORBA::Policy_ptr copy (void); + virtual CORBA::Policy_ptr copy (); - virtual void destroy (void); + virtual void destroy (); /// Change the CORBA representation to the ACE representation. void set_time_value (ACE_Time_Value &time_value); /// Return the cached policy type for this policy. - virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; + virtual TAO_Cached_Policy_Type _tao_cached_type () const; private: /// The attribute diff --git a/TAO/tao/Messaging/ExceptionHolder_i.cpp b/TAO/tao/Messaging/ExceptionHolder_i.cpp index d96e916f00c..12378b020b4 100644 --- a/TAO/tao/Messaging/ExceptionHolder_i.cpp +++ b/TAO/tao/Messaging/ExceptionHolder_i.cpp @@ -11,7 +11,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - ExceptionHolder::ExceptionHolder (void) : + ExceptionHolder::ExceptionHolder () : data_ (0), count_ (0), char_translator_ (0), @@ -47,7 +47,7 @@ namespace TAO this->count_ = exceptions_count; } - void ExceptionHolder::raise_exception (void) + void ExceptionHolder::raise_exception () { TAO_InputCDR _tao_in ((const char*) this->marshaled_exception ().get_buffer (), this->marshaled_exception ().length (), @@ -138,7 +138,7 @@ namespace TAO } CORBA::ValueBase* - ExceptionHolder::_copy_value (void) + ExceptionHolder::_copy_value () { TAO::ExceptionHolder* ret_val = 0; ACE_NEW_THROW_EX (ret_val, @@ -156,7 +156,7 @@ namespace TAO } CORBA::ValueBase * - ExceptionHolderFactory::create_for_unmarshal (void) + ExceptionHolderFactory::create_for_unmarshal () { TAO::ExceptionHolder* ret_val = 0; ACE_NEW_THROW_EX (ret_val, diff --git a/TAO/tao/Messaging/ExceptionHolder_i.h b/TAO/tao/Messaging/ExceptionHolder_i.h index f60bc86a0b0..0a1bda88ebb 100644 --- a/TAO/tao/Messaging/ExceptionHolder_i.h +++ b/TAO/tao/Messaging/ExceptionHolder_i.h @@ -45,7 +45,7 @@ namespace TAO public virtual ::CORBA::DefaultValueRefCountBase { public: - ExceptionHolder (void); + ExceptionHolder (); ExceptionHolder ( ::CORBA::Boolean is_system_exception, @@ -59,16 +59,16 @@ namespace TAO void set_exception_data (::TAO::Exception_Data* data, ::CORBA::ULong exceptions_count); - virtual void raise_exception (void); + virtual void raise_exception (); virtual void raise_exception_with_list ( const ::Dynamic::ExceptionList & exc_list); - virtual CORBA::ValueBase* _copy_value (void); + virtual CORBA::ValueBase* _copy_value (); protected: - virtual ~ExceptionHolder (void); + virtual ~ExceptionHolder (); private: TAO::Exception_Data* data_; @@ -88,7 +88,7 @@ namespace TAO public virtual CORBA::ValueFactoryBase { public: - virtual CORBA::ValueBase * create_for_unmarshal (void); + virtual CORBA::ValueBase * create_for_unmarshal (); }; } diff --git a/TAO/tao/Messaging/Messaging.cpp b/TAO/tao/Messaging/Messaging.cpp index afc92538ba0..afa6ebef8a8 100644 --- a/TAO/tao/Messaging/Messaging.cpp +++ b/TAO/tao/Messaging/Messaging.cpp @@ -7,7 +7,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL int -TAO_Messaging_Initializer::init (void) +TAO_Messaging_Initializer::init () { return ACE_Service_Config::process_directive (ace_svc_desc_TAO_Messaging_Loader); } diff --git a/TAO/tao/Messaging/Messaging.h b/TAO/tao/Messaging/Messaging.h index d9520e92332..7a3aa49b9a0 100644 --- a/TAO/tao/Messaging/Messaging.h +++ b/TAO/tao/Messaging/Messaging.h @@ -33,7 +33,7 @@ class TAO_Messaging_Export TAO_Messaging_Initializer { public: /// Used to force the initialisation of the ORB code. - static int init (void); + static int init (); }; static const int TAO_Requires_Messaging_Initializer = TAO_Messaging_Initializer::init (); diff --git a/TAO/tao/Messaging/Messaging_Loader.cpp b/TAO/tao/Messaging/Messaging_Loader.cpp index bd25ad2d9e2..4b17c72cfa3 100644 --- a/TAO/tao/Messaging/Messaging_Loader.cpp +++ b/TAO/tao/Messaging/Messaging_Loader.cpp @@ -8,12 +8,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Messaging_Loader::TAO_Messaging_Loader (void) +TAO_Messaging_Loader::TAO_Messaging_Loader () : initialized_ (false) { } -TAO_Messaging_Loader::~TAO_Messaging_Loader (void) +TAO_Messaging_Loader::~TAO_Messaging_Loader () { } diff --git a/TAO/tao/Messaging/Messaging_Loader.h b/TAO/tao/Messaging/Messaging_Loader.h index aa9b3247527..8229dd7a1c8 100644 --- a/TAO/tao/Messaging/Messaging_Loader.h +++ b/TAO/tao/Messaging/Messaging_Loader.h @@ -29,10 +29,10 @@ class TAO_Messaging_Export TAO_Messaging_Loader : public ACE_Service_Object { public: /// Constructor. - TAO_Messaging_Loader (void); + TAO_Messaging_Loader (); /// Destructor. - virtual ~TAO_Messaging_Loader (void); + virtual ~TAO_Messaging_Loader (); /// Initialize the Messaging loader hooks. virtual int init (int argc, ACE_TCHAR* []); diff --git a/TAO/tao/Messaging/Messaging_Policy_i.cpp b/TAO/tao/Messaging/Messaging_Policy_i.cpp index a3aadf66749..6bb83e9eee6 100644 --- a/TAO/tao/Messaging/Messaging_Policy_i.cpp +++ b/TAO/tao/Messaging/Messaging_Policy_i.cpp @@ -34,13 +34,13 @@ TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy ( } TimeBase::TimeT -TAO_RelativeRoundtripTimeoutPolicy::relative_expiry (void) +TAO_RelativeRoundtripTimeoutPolicy::relative_expiry () { return this->relative_expiry_; } CORBA::PolicyType -TAO_RelativeRoundtripTimeoutPolicy::policy_type (void) +TAO_RelativeRoundtripTimeoutPolicy::policy_type () { return Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE; } @@ -121,7 +121,7 @@ TAO_RelativeRoundtripTimeoutPolicy::create (const CORBA::Any& val) } TAO_RelativeRoundtripTimeoutPolicy * -TAO_RelativeRoundtripTimeoutPolicy::clone (void) const +TAO_RelativeRoundtripTimeoutPolicy::clone () const { TAO_RelativeRoundtripTimeoutPolicy *copy = 0; ACE_NEW_RETURN (copy, @@ -131,7 +131,7 @@ TAO_RelativeRoundtripTimeoutPolicy::clone (void) const } CORBA::Policy_ptr -TAO_RelativeRoundtripTimeoutPolicy::copy (void) +TAO_RelativeRoundtripTimeoutPolicy::copy () { // Future policy implementors: notice how the following code is // exception safe! @@ -145,12 +145,12 @@ TAO_RelativeRoundtripTimeoutPolicy::copy (void) } void -TAO_RelativeRoundtripTimeoutPolicy::destroy (void) +TAO_RelativeRoundtripTimeoutPolicy::destroy () { } TAO_Cached_Policy_Type -TAO_RelativeRoundtripTimeoutPolicy::_tao_cached_type (void) const +TAO_RelativeRoundtripTimeoutPolicy::_tao_cached_type () const { return TAO_CACHED_POLICY_RELATIVE_ROUNDTRIP_TIMEOUT; } @@ -200,7 +200,7 @@ TAO_Sync_Scope_Policy::TAO_Sync_Scope_Policy (const TAO_Sync_Scope_Policy &rhs) } CORBA::PolicyType -TAO_Sync_Scope_Policy::policy_type (void) +TAO_Sync_Scope_Policy::policy_type () { return Messaging::SYNC_SCOPE_POLICY_TYPE; } @@ -268,7 +268,7 @@ TAO_Sync_Scope_Policy::create (const CORBA::Any& val) } TAO_Sync_Scope_Policy * -TAO_Sync_Scope_Policy::clone (void) const +TAO_Sync_Scope_Policy::clone () const { TAO_Sync_Scope_Policy *copy = 0; ACE_NEW_RETURN (copy, @@ -278,13 +278,13 @@ TAO_Sync_Scope_Policy::clone (void) const } Messaging::SyncScope -TAO_Sync_Scope_Policy::synchronization (void) +TAO_Sync_Scope_Policy::synchronization () { return this->synchronization_; } CORBA::Policy_ptr -TAO_Sync_Scope_Policy::copy (void) +TAO_Sync_Scope_Policy::copy () { TAO_Sync_Scope_Policy *servant = 0; ACE_NEW_THROW_EX (servant, @@ -295,11 +295,11 @@ TAO_Sync_Scope_Policy::copy (void) } void -TAO_Sync_Scope_Policy::destroy (void) +TAO_Sync_Scope_Policy::destroy () { } TAO_Cached_Policy_Type -TAO_Sync_Scope_Policy::_tao_cached_type (void) const +TAO_Sync_Scope_Policy::_tao_cached_type () const { return TAO_CACHED_POLICY_SYNC_SCOPE; } diff --git a/TAO/tao/Messaging/Messaging_Policy_i.h b/TAO/tao/Messaging/Messaging_Policy_i.h index ba8ad68fcc5..27901cb7115 100644 --- a/TAO/tao/Messaging/Messaging_Policy_i.h +++ b/TAO/tao/Messaging/Messaging_Policy_i.h @@ -57,22 +57,22 @@ public: static CORBA::Policy_ptr create (const CORBA::Any& val); /// Returns a copy of @c this. - virtual TAO_RelativeRoundtripTimeoutPolicy *clone (void) const; + virtual TAO_RelativeRoundtripTimeoutPolicy *clone () const; // = The Messaging::RelativeRoundtripTimeoutPolicy methods - virtual TimeBase::TimeT relative_expiry (void); + virtual TimeBase::TimeT relative_expiry (); - virtual CORBA::PolicyType policy_type (void); + virtual CORBA::PolicyType policy_type (); - virtual CORBA::Policy_ptr copy (void); + virtual CORBA::Policy_ptr copy (); - virtual void destroy (void); + virtual void destroy (); /// Change the CORBA representation to the ACE representation. void set_time_value (ACE_Time_Value &time_value); /// Return the cached policy type for this policy. - virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; + virtual TAO_Cached_Policy_Type _tao_cached_type () const; private: /// The attribute @@ -117,22 +117,22 @@ public: static CORBA::Policy_ptr create (const CORBA::Any& val); /// Returns a copy of <this>. - virtual TAO_Sync_Scope_Policy *clone (void) const; + virtual TAO_Sync_Scope_Policy *clone () const; // = The Messaging::SyncScopePolicy methods. - virtual Messaging::SyncScope synchronization (void); + virtual Messaging::SyncScope synchronization (); void get_synchronization (Messaging::SyncScope &synchronization) const; - virtual CORBA::PolicyType policy_type (void); + virtual CORBA::PolicyType policy_type (); - virtual CORBA::Policy_ptr copy (void); + virtual CORBA::Policy_ptr copy (); - virtual void destroy (void); + virtual void destroy (); // Return the cached policy type for this policy. - virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; + virtual TAO_Cached_Policy_Type _tao_cached_type () const; private: /// The attribute diff --git a/TAO/tao/Monitor/Monitor_Impl.h b/TAO/tao/Monitor/Monitor_Impl.h index 5984d73a56b..59c6bf39eba 100644 --- a/TAO/tao/Monitor/Monitor_Impl.h +++ b/TAO/tao/Monitor/Monitor_Impl.h @@ -48,7 +48,6 @@ public: const ::Monitor::ConstraintStructList & constraint); private: - /// Use an ORB reference to convert strings to objects and shutdown /// the application. CORBA::ORB_var orb_; diff --git a/TAO/tao/Muxed_TMS.cpp b/TAO/tao/Muxed_TMS.cpp index e7d9022413a..c80043ad541 100644 --- a/TAO/tao/Muxed_TMS.cpp +++ b/TAO/tao/Muxed_TMS.cpp @@ -9,7 +9,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Muxed_TMS::TAO_Muxed_TMS (TAO_Transport *transport) : TAO_Transport_Mux_Strategy (transport) - , lock_ (0) + , lock_ (nullptr) , request_id_generator_ (0) , orb_core_ (transport->orb_core ()) , dispatcher_table_ (this->orb_core_->client_factory ()->reply_dispatcher_table_size ()) @@ -18,7 +18,7 @@ TAO_Muxed_TMS::TAO_Muxed_TMS (TAO_Transport *transport) this->orb_core_->client_factory ()->create_transport_mux_strategy_lock (); } -TAO_Muxed_TMS::~TAO_Muxed_TMS (void) +TAO_Muxed_TMS::~TAO_Muxed_TMS () { delete this->lock_; } @@ -26,7 +26,7 @@ TAO_Muxed_TMS::~TAO_Muxed_TMS (void) // Generate and return an unique request id for the current // invocation. CORBA::ULong -TAO_Muxed_TMS::request_id (void) +TAO_Muxed_TMS::request_id () { // @@ What is a good error return value? ACE_GUARD_RETURN (ACE_Lock, @@ -67,7 +67,7 @@ TAO_Muxed_TMS::bind_dispatcher (CORBA::ULong request_id, *this->lock_, -1); - if (rd == 0) + if (rd == nullptr) { if (TAO_debug_level > 0) { @@ -106,7 +106,7 @@ TAO_Muxed_TMS::unbind_dispatcher (CORBA::ULong request_id) } bool -TAO_Muxed_TMS::has_request (void) +TAO_Muxed_TMS::has_request () { ACE_GUARD_RETURN (ACE_Lock, ace_mon, @@ -120,7 +120,7 @@ int TAO_Muxed_TMS::dispatch_reply (TAO_Pluggable_Reply_Params ¶ms) { int result = 0; - ACE_Intrusive_Auto_Ptr<TAO_Reply_Dispatcher> rd(0); + ACE_Intrusive_Auto_Ptr<TAO_Reply_Dispatcher> rd(nullptr); // Grab the reply dispatcher for this id. { @@ -167,7 +167,7 @@ int TAO_Muxed_TMS::reply_timed_out (CORBA::ULong request_id) { int result = 0; - ACE_Intrusive_Auto_Ptr<TAO_Reply_Dispatcher> rd(0); + ACE_Intrusive_Auto_Ptr<TAO_Reply_Dispatcher> rd(nullptr); // Grab the reply dispatcher for this id. { @@ -218,25 +218,25 @@ TAO_Muxed_TMS::reply_timed_out (CORBA::ULong request_id) bool -TAO_Muxed_TMS::idle_after_send (void) +TAO_Muxed_TMS::idle_after_send () { // Irrespective of whether we are successful or not we need to // return true. If *this* class is not successful in idling the // transport no one can. - if (this->transport_ != 0) + if (this->transport_ != nullptr) (void) this->transport_->make_idle (); return true; } bool -TAO_Muxed_TMS::idle_after_reply (void) +TAO_Muxed_TMS::idle_after_reply () { return false; } void -TAO_Muxed_TMS::connection_closed (void) +TAO_Muxed_TMS::connection_closed () { ACE_GUARD (ACE_Lock, ace_mon, @@ -251,7 +251,7 @@ TAO_Muxed_TMS::connection_closed (void) } int -TAO_Muxed_TMS::clear_cache_i (void) +TAO_Muxed_TMS::clear_cache_i () { if (this->dispatcher_table_.current_size () == 0) return -1; @@ -274,7 +274,7 @@ TAO_Muxed_TMS::clear_cache_i (void) for (size_t k = 0 ; k != sz ; ++k) { - ACE_Intrusive_Auto_Ptr<TAO_Reply_Dispatcher> rd(0); + ACE_Intrusive_Auto_Ptr<TAO_Reply_Dispatcher> rd(nullptr); if (ubs.pop (rd) == 0) { diff --git a/TAO/tao/Muxed_TMS.h b/TAO/tao/Muxed_TMS.h index a680d25cc84..58bbe6fdbf3 100644 --- a/TAO/tao/Muxed_TMS.h +++ b/TAO/tao/Muxed_TMS.h @@ -46,17 +46,16 @@ class TAO_Reply_Dispatcher; */ class TAO_Export TAO_Muxed_TMS : public TAO_Transport_Mux_Strategy { - public: /// Constructor. TAO_Muxed_TMS (TAO_Transport *transport); /// Destructor. - virtual ~TAO_Muxed_TMS (void); + virtual ~TAO_Muxed_TMS (); /// Generate and return an unique request id for the current /// invocation. - virtual CORBA::ULong request_id (void); + virtual CORBA::ULong request_id (); // = Please read the documentation in the TAO_Transport_Mux_Strategy // class. @@ -67,10 +66,10 @@ public: virtual int dispatch_reply (TAO_Pluggable_Reply_Params ¶ms); virtual int reply_timed_out (CORBA::ULong request_id); - virtual bool idle_after_send (void); - virtual bool idle_after_reply (void); - virtual void connection_closed (void); - virtual bool has_request (void); + virtual bool idle_after_send (); + virtual bool idle_after_reply (); + virtual void connection_closed (); + virtual bool has_request (); private: void operator= (const TAO_Muxed_TMS &); @@ -98,7 +97,7 @@ private: /// Table of <Request ID, Reply Dispatcher> pairs. REQUEST_DISPATCHER_TABLE dispatcher_table_; - int clear_cache_i (void); + int clear_cache_i (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/NVList_Adapter.cpp b/TAO/tao/NVList_Adapter.cpp index a1b542673cc..f4050918d63 100644 --- a/TAO/tao/NVList_Adapter.cpp +++ b/TAO/tao/NVList_Adapter.cpp @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_NVList_Adapter::~TAO_NVList_Adapter (void) +TAO_NVList_Adapter::~TAO_NVList_Adapter () { } diff --git a/TAO/tao/NVList_Adapter.h b/TAO/tao/NVList_Adapter.h index 22d33393918..7b961a81f0e 100644 --- a/TAO/tao/NVList_Adapter.h +++ b/TAO/tao/NVList_Adapter.h @@ -40,7 +40,7 @@ namespace CORBA class TAO_Export TAO_NVList_Adapter : public ACE_Service_Object { public: - virtual ~TAO_NVList_Adapter (void); + virtual ~TAO_NVList_Adapter (); virtual void create_list (CORBA::Long count, CORBA::NVList_ptr &new_list) = 0; diff --git a/TAO/tao/Nested_Upcall_Guard.h b/TAO/tao/Nested_Upcall_Guard.h index 60c95f9e8ca..3673bae0fde 100644 --- a/TAO/tao/Nested_Upcall_Guard.h +++ b/TAO/tao/Nested_Upcall_Guard.h @@ -84,9 +84,10 @@ namespace TAO private: Nested_Upcall_Guard (void); - /// Disallow copying and assignment. - Nested_Upcall_Guard (const Nested_Upcall_Guard&); - Nested_Upcall_Guard &operator= (const Nested_Upcall_Guard&); + Nested_Upcall_Guard (const Nested_Upcall_Guard&) = delete; + Nested_Upcall_Guard &operator= (const Nested_Upcall_Guard&) = delete; + Nested_Upcall_Guard (Nested_Upcall_Guard&&) = delete; + Nested_Upcall_Guard &operator= (Nested_Upcall_Guard&&) = delete; private: /// Pointer to the transport that we plan to use. diff --git a/TAO/tao/Network_Priority_Protocols_Hooks.cpp b/TAO/tao/Network_Priority_Protocols_Hooks.cpp index db6e3aaea66..8f7d55568c4 100644 --- a/TAO/tao/Network_Priority_Protocols_Hooks.cpp +++ b/TAO/tao/Network_Priority_Protocols_Hooks.cpp @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Network_Priority_Protocols_Hooks:: -~TAO_Network_Priority_Protocols_Hooks (void) +~TAO_Network_Priority_Protocols_Hooks () { } diff --git a/TAO/tao/New_Leader_Generator.cpp b/TAO/tao/New_Leader_Generator.cpp index e490ae08f73..17e0cb12f97 100644 --- a/TAO/tao/New_Leader_Generator.cpp +++ b/TAO/tao/New_Leader_Generator.cpp @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_New_Leader_Generator::~TAO_New_Leader_Generator (void) +TAO_New_Leader_Generator::~TAO_New_Leader_Generator () { } diff --git a/TAO/tao/New_Leader_Generator.h b/TAO/tao/New_Leader_Generator.h index 25c289aa65d..9560a347fa1 100644 --- a/TAO/tao/New_Leader_Generator.h +++ b/TAO/tao/New_Leader_Generator.h @@ -33,7 +33,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Export TAO_New_Leader_Generator { public: - /// Destructor. virtual ~TAO_New_Leader_Generator (void); diff --git a/TAO/tao/Null_Fragmentation_Strategy.cpp b/TAO/tao/Null_Fragmentation_Strategy.cpp index d41d7f42d34..f04ae96cad2 100644 --- a/TAO/tao/Null_Fragmentation_Strategy.cpp +++ b/TAO/tao/Null_Fragmentation_Strategy.cpp @@ -1,6 +1,6 @@ #include "tao/Null_Fragmentation_Strategy.h" -TAO_Null_Fragmentation_Strategy::~TAO_Null_Fragmentation_Strategy (void) +TAO_Null_Fragmentation_Strategy::~TAO_Null_Fragmentation_Strategy () { } diff --git a/TAO/tao/Null_Fragmentation_Strategy.h b/TAO/tao/Null_Fragmentation_Strategy.h index 528b1a28714..6efc37b0450 100644 --- a/TAO/tao/Null_Fragmentation_Strategy.h +++ b/TAO/tao/Null_Fragmentation_Strategy.h @@ -40,17 +40,15 @@ class TAO_Null_Fragmentation_Strategy : public TAO_GIOP_Fragmentation_Strategy { public: - TAO_Null_Fragmentation_Strategy (void) {} virtual ~TAO_Null_Fragmentation_Strategy (void); virtual int fragment (TAO_OutputCDR &, ACE_CDR::ULong, ACE_CDR::ULong); private: - - // Disallow copying and assignment. - TAO_Null_Fragmentation_Strategy (TAO_Null_Fragmentation_Strategy const &); - void operator= (TAO_Null_Fragmentation_Strategy const &); - + TAO_Null_Fragmentation_Strategy (TAO_Null_Fragmentation_Strategy const &) = delete; + void operator= (TAO_Null_Fragmentation_Strategy const &) = delete; + TAO_Null_Fragmentation_Strategy (TAO_Null_Fragmentation_Strategy &&) = delete; + void operator= (TAO_Null_Fragmentation_Strategy &&) = delete; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index 9b930da8c0d..70f9681685e 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -45,14 +45,14 @@ static const char ior_prefix[] = "IOR:"; TAO_BEGIN_VERSIONED_NAMESPACE_DECL -CORBA::ORB::InvalidName::InvalidName (void) +CORBA::ORB::InvalidName::InvalidName () : CORBA::UserException ("IDL:omg.org/CORBA/ORB/InvalidName:1.0", "InvalidName") { } // Destructor - all members are of self managing types. -CORBA::ORB::InvalidName::~InvalidName (void) +CORBA::ORB::InvalidName::~InvalidName () { } @@ -77,25 +77,25 @@ CORBA::ORB::InvalidName::_downcast (CORBA::Exception *exc) return dynamic_cast<InvalidName *> (exc); } -CORBA::Exception *CORBA::ORB::InvalidName::_alloc (void) +CORBA::Exception *CORBA::ORB::InvalidName::_alloc () { - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::CORBA::ORB::InvalidName, 0); + CORBA::Exception *retval = nullptr; + ACE_NEW_RETURN (retval, ::CORBA::ORB::InvalidName, nullptr); return retval; } CORBA::Exception * -CORBA::ORB::InvalidName::_tao_duplicate (void) const +CORBA::ORB::InvalidName::_tao_duplicate () const { - CORBA::Exception *result = 0; + CORBA::Exception *result = nullptr; ACE_NEW_RETURN ( result, ::CORBA::ORB::InvalidName (*this), - 0); + nullptr); return result; } -void CORBA::ORB::InvalidName::_raise (void) const +void CORBA::ORB::InvalidName::_raise () const { throw *this; } @@ -116,11 +116,11 @@ CORBA::ORB::ORB (TAO_ORB_Core *orb_core) : refcount_ (1) , orb_core_ (orb_core) , use_omg_ior_format_ (1) - , timeout_ (0) + , timeout_ (nullptr) { } -CORBA::ORB::~ORB (void) +CORBA::ORB::~ORB () { // This destructor is only invoked when the last ORB reference (not // instance) is being destroyed. @@ -138,9 +138,9 @@ CORBA::ORB::shutdown (CORBA::Boolean wait_for_completion) } void -CORBA::ORB::destroy (void) +CORBA::ORB::destroy () { - if (this->orb_core () == 0) + if (this->orb_core () == nullptr) { // If the ORB_Core pointer is zero, assume that the ORB_Core has // been destroyed. @@ -163,13 +163,13 @@ CORBA::ORB::destroy (void) // Now invalidate the pointer to the ORB_Core that created this // ORB. - this->orb_core_ = 0; + this->orb_core_ = nullptr; } void -CORBA::ORB::run (void) +CORBA::ORB::run () { - this->run (0); + this->run (nullptr); } void @@ -187,9 +187,9 @@ CORBA::ORB::run (ACE_Time_Value *tv) } void -CORBA::ORB::perform_work (void) +CORBA::ORB::perform_work () { - this->perform_work (0); + this->perform_work (nullptr); } void @@ -224,7 +224,7 @@ CORBA::ORB::work_pending (ACE_Time_Value &tv) } CORBA::Boolean -CORBA::ORB::work_pending (void) +CORBA::ORB::work_pending () { // This method should not be called if the ORB has been shutdown. this->check_shutdown (); @@ -247,7 +247,7 @@ CORBA::ORB::create_list (CORBA::Long count, CORBA::NVList_ptr &new_list) TAO_NVList_Adapter *adapter = ACE_Dynamic_Service<TAO_NVList_Adapter>::instance ("TAO_NVList_Adapter"); - if (adapter == 0) + if (adapter == nullptr) { TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), @@ -277,7 +277,7 @@ CORBA::ORB::create_operation_list (CORBA::OperationDef_ptr opDef, ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name ()); - if (adapter == 0) + if (adapter == nullptr) { throw ::CORBA::INTF_REPOS (); } @@ -305,7 +305,7 @@ CORBA::ORB::create_named_value (CORBA::NamedValue_ptr &nv) ACE_Dynamic_Service<TAO_NVList_Adapter>::instance ( "TAO_NVList_Adapter"); - if (adapter == 0) + if (adapter == nullptr) { TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), @@ -384,7 +384,7 @@ CORBA::ORB::get_next_response (CORBA::Request_ptr &) } CORBA::Boolean -CORBA::ORB::poll_next_response (void) +CORBA::ORB::poll_next_response () { throw ::CORBA::NO_IMPLEMENT ( CORBA::SystemException::_tao_minor_code ( @@ -405,7 +405,7 @@ CORBA::ORB::create_struct_tc ( ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( TAO_ORB_Core::typecodefactory_adapter_name ()); - if (adapter == 0) + if (adapter == nullptr) { throw ::CORBA::INTERNAL (); } @@ -424,7 +424,7 @@ CORBA::ORB::create_union_tc ( ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( TAO_ORB_Core::typecodefactory_adapter_name ()); - if (adapter == 0) + if (adapter == nullptr) { throw ::CORBA::INTERNAL (); } @@ -445,7 +445,7 @@ CORBA::ORB::create_enum_tc ( ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( TAO_ORB_Core::typecodefactory_adapter_name ()); - if (adapter == 0) + if (adapter == nullptr) { throw ::CORBA::INTERNAL (); } @@ -463,7 +463,7 @@ CORBA::ORB::create_alias_tc ( ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( TAO_ORB_Core::typecodefactory_adapter_name ()); - if (adapter == 0) + if (adapter == nullptr) { throw ::CORBA::INTERNAL (); } @@ -481,7 +481,7 @@ CORBA::ORB::create_exception_tc ( ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( TAO_ORB_Core::typecodefactory_adapter_name ()); - if (adapter == 0) + if (adapter == nullptr) { throw ::CORBA::INTERNAL (); } @@ -498,7 +498,7 @@ CORBA::ORB::create_interface_tc ( ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( TAO_ORB_Core::typecodefactory_adapter_name ()); - if (adapter == 0) + if (adapter == nullptr) { throw ::CORBA::INTERNAL (); } @@ -514,7 +514,7 @@ CORBA::ORB::create_string_tc ( ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( TAO_ORB_Core::typecodefactory_adapter_name ()); - if (adapter == 0) + if (adapter == nullptr) { throw ::CORBA::INTERNAL (); } @@ -530,7 +530,7 @@ CORBA::ORB::create_wstring_tc ( ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( TAO_ORB_Core::typecodefactory_adapter_name ()); - if (adapter == 0) + if (adapter == nullptr) { throw ::CORBA::INTERNAL (); } @@ -547,7 +547,7 @@ CORBA::ORB::create_fixed_tc ( ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( TAO_ORB_Core::typecodefactory_adapter_name ()); - if (adapter == 0) + if (adapter == nullptr) { throw ::CORBA::INTERNAL (); } @@ -564,7 +564,7 @@ CORBA::ORB::create_sequence_tc ( ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( TAO_ORB_Core::typecodefactory_adapter_name ()); - if (adapter == 0) + if (adapter == nullptr) { throw ::CORBA::INTERNAL (); } @@ -581,7 +581,7 @@ CORBA::ORB::create_array_tc ( ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( TAO_ORB_Core::typecodefactory_adapter_name ()); - if (adapter == 0) + if (adapter == nullptr) { throw ::CORBA::INTERNAL (); } @@ -601,7 +601,7 @@ CORBA::ORB::create_value_tc ( ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( TAO_ORB_Core::typecodefactory_adapter_name ()); - if (adapter == 0) + if (adapter == nullptr) { throw ::CORBA::INTERNAL (); } @@ -622,7 +622,7 @@ CORBA::ORB::create_value_box_tc ( ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( TAO_ORB_Core::typecodefactory_adapter_name ()); - if (adapter == 0) + if (adapter == nullptr) { throw ::CORBA::INTERNAL (); } @@ -637,7 +637,7 @@ CORBA::ORB::create_native_tc (const char *id, const char *name) ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( TAO_ORB_Core::typecodefactory_adapter_name ()); - if (adapter == 0) + if (adapter == nullptr) { throw ::CORBA::INTERNAL (); } @@ -652,7 +652,7 @@ CORBA::ORB::create_recursive_tc (const char *id) ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( TAO_ORB_Core::typecodefactory_adapter_name ()); - if (adapter == 0) + if (adapter == nullptr) { throw ::CORBA::INTERNAL (); } @@ -667,7 +667,7 @@ CORBA::ORB::create_abstract_interface_tc (const char *id, const char *name) ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( TAO_ORB_Core::typecodefactory_adapter_name ()); - if (adapter == 0) + if (adapter == nullptr) { throw ::CORBA::INTERNAL (); } @@ -682,7 +682,7 @@ CORBA::ORB::create_local_interface_tc (const char *id, const char *name) ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( TAO_ORB_Core::typecodefactory_adapter_name ()); - if (adapter == 0) + if (adapter == nullptr) { throw ::CORBA::INTERNAL (); } @@ -697,7 +697,7 @@ CORBA::ORB::create_component_tc (const char *id, const char *name) ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( TAO_ORB_Core::typecodefactory_adapter_name ()); - if (adapter == 0) + if (adapter == nullptr) { throw ::CORBA::INTERNAL (); } @@ -712,7 +712,7 @@ CORBA::ORB::create_home_tc (const char *id, const char *name) ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( TAO_ORB_Core::typecodefactory_adapter_name ()); - if (adapter == 0) + if (adapter == nullptr) { throw ::CORBA::INTERNAL (); } @@ -732,7 +732,7 @@ CORBA::ORB::create_event_tc ( ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( TAO_ORB_Core::typecodefactory_adapter_name ()); - if (adapter == 0) + if (adapter == nullptr) { throw ::CORBA::INTERNAL (); } @@ -749,13 +749,13 @@ CORBA::ORB::create_event_tc ( #endif /* TAO_HAS_MINIMUM_CORBA */ CORBA::Object_ptr -CORBA::ORB::resolve_policy_manager (void) +CORBA::ORB::resolve_policy_manager () { #if (TAO_HAS_CORBA_MESSAGING == 1) TAO_Policy_Manager *policy_manager = this->orb_core_->policy_manager (); - if (policy_manager == 0) + if (policy_manager == nullptr) { return CORBA::Object::_nil (); } @@ -770,7 +770,7 @@ CORBA::ORB::resolve_policy_manager (void) } CORBA::Object_ptr -CORBA::ORB::resolve_policy_current (void) +CORBA::ORB::resolve_policy_current () { #if (TAO_HAS_CORBA_MESSAGING == 1) @@ -827,7 +827,7 @@ CORBA::ORB::resolve_service (TAO::MCAST_SERVICEID mcast_service_id) char const * const port_number = ACE_OS::getenv (env_service_port[mcast_service_id]); - if (port_number != 0) + if (port_number != nullptr) port = static_cast<unsigned short> (ACE_OS::atoi (port_number)); else port = default_service_port[mcast_service_id]; @@ -1005,7 +1005,7 @@ CORBA::ORB::resolve_initial_references (const char *name, void CORBA::ORB::register_initial_reference (const char * id, CORBA::Object_ptr obj) { - if (id == 0 || ACE_OS::strlen (id) == 0) + if (id == nullptr || ACE_OS::strlen (id) == 0) throw ::CORBA::ORB::InvalidName (); if (CORBA::is_nil (obj)) @@ -1020,7 +1020,7 @@ CORBA::ORB::register_initial_reference (const char * id, CORBA::Object_ptr obj) CORBA::Object_ptr CORBA::ORB::unregister_initial_reference (const char * id) { - if (id == 0 || ACE_OS::strlen (id) == 0) + if (id == nullptr || ACE_OS::strlen (id) == 0) throw ::CORBA::ORB::InvalidName (); TAO_Object_Ref_Table &table = this->orb_core_->object_ref_table (); @@ -1034,7 +1034,7 @@ CORBA::ORB::unregister_initial_reference (const char * id) #endif CORBA::ORB::ObjectIdList_ptr -CORBA::ORB::list_initial_services (void) +CORBA::ORB::list_initial_services () { this->check_shutdown (); @@ -1042,9 +1042,9 @@ CORBA::ORB::list_initial_services (void) } void -CORBA::ORB::check_shutdown (void) +CORBA::ORB::check_shutdown () { - if (this->orb_core () != 0) + if (this->orb_core () != nullptr) { this->orb_core ()->check_shutdown (); } @@ -1134,7 +1134,7 @@ namespace TAO // big as the default repository if (ACE_OS::strcasecmp (arg, ACE_TEXT("LOCAL")) == 0) { - ACE_Service_Gestalt* gestalt = 0; + ACE_Service_Gestalt* gestalt = nullptr; ACE_NEW_THROW_EX (gestalt, ACE_Service_Gestalt (ACE_Service_Gestalt::MAX_SERVICES / 4, true), @@ -1166,7 +1166,7 @@ namespace TAO // Get ORB Core TAO_ORB_Core_Auto_Ptr oc (TAO::ORB_Table::instance ()->find ( ACE_TEXT_ALWAYS_CHAR(orbid.c_str ()))); - if (oc.get () != 0) + if (oc.get () != nullptr) return oc->configuration (); if (TAO_debug_level > 0) @@ -1237,7 +1237,7 @@ CORBA::ORB_init (int &argc, ACE_TCHAR *argv[], const char *orbid) : 0); if ((argc == 0 && argv0_len != 0) - || (argc != 0 && (argv == 0 || argv[0] == 0))) + || (argc != 0 && (argv == nullptr || argv[0] == nullptr))) { throw ::CORBA::BAD_PARAM ( CORBA::SystemException::_tao_minor_code ( @@ -1273,7 +1273,7 @@ CORBA::ORB_init (int &argc, ACE_TCHAR *argv[], const char *orbid) ACE_TEXT_ALWAYS_CHAR(orbid_string.c_str ()))); // The ORB was already initialized. Just return that one. - if (oc.get () != 0) + if (oc.get () != nullptr) { return CORBA::ORB::_duplicate (oc->orb ()); } @@ -1288,7 +1288,7 @@ CORBA::ORB_init (int &argc, ACE_TCHAR *argv[], const char *orbid) // An ORB corresponding to the desired ORBid doesn't exist so create // a new one. - TAO_ORB_Core * tmp = 0; + TAO_ORB_Core * tmp = nullptr; ACE_NEW_THROW_EX (tmp, TAO_ORB_Core (ACE_TEXT_ALWAYS_CHAR(orbid_string.c_str ()), gestalt), @@ -1343,7 +1343,7 @@ CORBA::ORB_init (int &argc, ACE_TCHAR *argv[], const char *orbid) PortableInterceptor::SlotId slotid = 0; size_t pre_init_count = 0; - if (orbinitializer_registry != 0) + if (orbinitializer_registry != nullptr) { pre_init_count = orbinitializer_registry->pre_init (oc.get (), @@ -1356,7 +1356,7 @@ CORBA::ORB_init (int &argc, ACE_TCHAR *argv[], const char *orbid) result = oc->init (command_line.get_argc(), command_line.get_ASCII_argv()); - if (orbinitializer_registry != 0) + if (orbinitializer_registry != nullptr) { orbinitializer_registry->post_init (pre_init_count, oc.get (), @@ -1400,7 +1400,7 @@ CORBA::ORB::object_to_string (CORBA::Object_ptr obj) char* user_string = obj->convert_to_ior (this->use_omg_ior_format_, ior_prefix); - if (user_string != 0) + if (user_string != nullptr) return user_string; } @@ -1448,20 +1448,20 @@ CORBA::ORB::object_to_string (CORBA::Object_ptr obj) // return that string. size_t const total_len = cdr.total_length (); - char *cp = 0; + char *cp = nullptr; ACE_ALLOCATOR_RETURN (cp, CORBA::string_alloc ( sizeof ior_prefix + 2 * static_cast<CORBA::ULong> (total_len)), - 0); + nullptr); CORBA::String_var string = cp; ACE_OS::strcpy (cp, ior_prefix); cp += sizeof (ior_prefix) - 1; - for (const ACE_Message_Block *i = cdr.begin (); i != 0; i = i->cont ()) + for (const ACE_Message_Block *i = cdr.begin (); i != nullptr; i = i->cont ()) { const char *bytes = i->rd_ptr (); size_t len = i->length (); @@ -1483,7 +1483,7 @@ CORBA::ORB::object_to_string (CORBA::Object_ptr obj) // It is perfectly valid to marshal a nil object reference. // However, it is not possible to convert a nil object reference // to a URL IOR, so throw an exception. - if (CORBA::is_nil (obj) || obj->_stubobj () == 0) + if (CORBA::is_nil (obj) || obj->_stubobj () == nullptr) { if (TAO_debug_level > 0) TAOLIB_ERROR ((LM_ERROR, @@ -1530,7 +1530,7 @@ CORBA::ORB::string_to_object (const char *str) this->check_shutdown (); // Check for NULL pointer - if (str == 0) + if (str == nullptr) throw ::CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( 0, @@ -1540,7 +1540,7 @@ CORBA::ORB::string_to_object (const char *str) TAO_IOR_Parser *ior_parser = this->orb_core_->parser_registry ()->match_parser (str); - if (ior_parser != 0) + if (ior_parser != nullptr) { return ior_parser->parse_string (str, this); } @@ -1562,7 +1562,7 @@ CORBA::ORB::string_to_object (const wchar_t *str) // **************************************************************** char * -CORBA::ORB::id (void) +CORBA::ORB::id () { return CORBA::string_dup (this->orb_core_->orbid ()); } @@ -1578,7 +1578,7 @@ CORBA::ORB::create_policy (CORBA::PolicyType type, const CORBA::Any& val) TAO::PolicyFactory_Registry_Adapter *adapter = this->orb_core_->policy_factory_registry (); - if (adapter == 0) + if (adapter == nullptr) { throw ::CORBA::INTERNAL (); } @@ -1597,7 +1597,7 @@ CORBA::ORB::_create_policy (CORBA::PolicyType type) TAO::PolicyFactory_Registry_Adapter *adapter = this->orb_core_->policy_factory_registry (); - if (adapter == 0) + if (adapter == nullptr) { throw ::CORBA::INTERNAL (); } @@ -1689,7 +1689,7 @@ CORBA::ORB::url_ior_string_to_object (const char* str) } // Now make the TAO_Stub. - TAO_Stub *data = this->orb_core_->create_stub ((char *) 0, mprofile); + TAO_Stub *data = this->orb_core_->create_stub ((char *) nullptr, mprofile); TAO_Stub_Auto_Ptr safe_objdata (data); diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h index 7878dbbb274..81e5633180d 100644 --- a/TAO/tao/ORB.h +++ b/TAO/tao/ORB.h @@ -35,11 +35,7 @@ #include "ace/Thread_Mutex.h" #include "ace/Guard_T.h" -#if defined (ACE_HAS_CPP11) -# include <atomic> -#else -# include "ace/Atomic_Op.h" -#endif /* ACE_HAS_CPP11 */ +#include <atomic> TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -171,18 +167,18 @@ namespace CORBA class TAO_Export InvalidName : public CORBA::UserException { public: - InvalidName (void); + InvalidName (); InvalidName (const InvalidName &); - ~InvalidName (void); + ~InvalidName (); InvalidName &operator= (const InvalidName &); static InvalidName *_downcast (CORBA::Exception *); - static CORBA::Exception *_alloc (void); + static CORBA::Exception *_alloc (); - virtual CORBA::Exception *_tao_duplicate (void) const; + virtual CORBA::Exception *_tao_duplicate () const; - virtual void _raise (void) const; + virtual void _raise () const; virtual void _tao_encode (TAO_OutputCDR &) const; @@ -209,10 +205,10 @@ namespace CORBA /// Returns a pointer to a nil ORB, i.e., an non-existent ORB. This /// can be used for initialization or in comparisons. - static CORBA::ORB_ptr _nil (void); + static CORBA::ORB_ptr _nil (); /// Return this ORB's ORBid. - char * id (void); + char * id (); /** * Turn a string-ified object reference back into an object @@ -284,7 +280,7 @@ namespace CORBA void get_next_response (CORBA::Request_ptr &req); - CORBA::Boolean poll_next_response (void); + CORBA::Boolean poll_next_response (); /// The ORB TypeCode creation functions. @@ -381,7 +377,7 @@ namespace CORBA * If an error occurs during initialization or at runtime, a CORBA * system exception will be thrown. */ - void run (void); + void run (); /** * Instructs the ORB to initialize itself and run its event loop in @@ -417,7 +413,7 @@ namespace CORBA /// Returns an indication of whether the ORB needs to perform some /// work. - CORBA::Boolean work_pending (void); + CORBA::Boolean work_pending (); /// Returns an indication of whether the ORB needs to perform some /// work but will look for work pending for no more than the @@ -434,7 +430,7 @@ namespace CORBA * is not present; this behavior can be modified by passing an * appropriate @c ACE_Time_Value as described in run(). **/ - void perform_work (void); + void perform_work (); void perform_work (ACE_Time_Value &tv); void perform_work (ACE_Time_Value *tv); @@ -460,7 +456,7 @@ namespace CORBA * the ORB in one thread and trying to service a request in another * thread are not well defined. TAO does not support such cases. */ - void destroy (void); + void destroy (); /** * This method acts as a mini-bootstrapping Naming Service, which is @@ -492,7 +488,7 @@ namespace CORBA /// Returns a sequence of ObjectIds that lists which objects have /// references available via the initial references mechanism. - CORBA::ORB::ObjectIdList_ptr list_initial_services (void); + CORBA::ORB::ObjectIdList_ptr list_initial_services (); #if !defined(CORBA_E_MICRO) CORBA::Policy_ptr create_policy (CORBA::PolicyType type, @@ -510,18 +506,18 @@ namespace CORBA #endif /// Reference counting... - unsigned long _incr_refcount (void); - unsigned long _decr_refcount (void); - unsigned long _refcount (void) const; + unsigned long _incr_refcount (); + unsigned long _decr_refcount (); + unsigned long _refcount () const; /// Set the IOR flag. void _use_omg_ior_format (CORBA::Boolean ior); /// Get the IOR flag. - CORBA::Boolean _use_omg_ior_format (void); + CORBA::Boolean _use_omg_ior_format (); /// Get the ORB core. - TAO_ORB_Core *orb_core (void) const; + TAO_ORB_Core *orb_core () const; /// Factory method that creates an ORB. static CORBA::ORB_ptr _tao_make_ORB (TAO_ORB_Core * orb_core); @@ -532,7 +528,7 @@ namespace CORBA typedef ORB_out _out_type; /// Get the Timeout value - ACE_Time_Value *get_timeout (void); + ACE_Time_Value *get_timeout (); protected: // We must be created via the @c CORBA::ORB_init() function. @@ -543,13 +539,13 @@ namespace CORBA * Protected destructor to enforce proper memory management * through the reference counting mechanism. */ - ~ORB (void); + ~ORB (); /// Resolve the Policy Manager for this ORB. - CORBA::Object_ptr resolve_policy_manager (void); + CORBA::Object_ptr resolve_policy_manager (); /// Resolve the Policy Current for this thread. - CORBA::Object_ptr resolve_policy_current (void); + CORBA::Object_ptr resolve_policy_current (); private: /// Resolve the given service based on the service ID. @@ -568,7 +564,7 @@ namespace CORBA /// Check if ORB has shutdown. If it has, throw the appropriate /// exception. - void check_shutdown (void); + void check_shutdown (); /// Set the timeout value void set_timeout (ACE_Time_Value * timeout); @@ -576,11 +572,7 @@ namespace CORBA private: /// Maintains a reference count of number of instantiations of the /// ORB. -#if defined (ACE_HAS_CPP11) std::atomic<uint32_t> refcount_; -#else - ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; -#endif /* ACE_HAS_CPP11 */ /// The ORB_Core that created us.... TAO_ORB_Core * orb_core_; @@ -594,7 +586,6 @@ namespace CORBA /// Timeout value ACE_Time_Value * timeout_; - }; } // End namespace CORBA diff --git a/TAO/tao/ORB.inl b/TAO/tao/ORB.inl index b46a2f83819..1043a54de32 100644 --- a/TAO/tao/ORB.inl +++ b/TAO/tao/ORB.inl @@ -26,11 +26,7 @@ CORBA::ORB::_incr_refcount (void) ACE_INLINE unsigned long CORBA::ORB::_refcount (void) const { -#if defined (ACE_HAS_CPP11) return this->refcount_; -#else - return this->refcount_.value (); -#endif /* ACE_HAS_CPP11 */ } ACE_INLINE unsigned long diff --git a/TAO/tao/ORBInitializer_Registry.cpp b/TAO/tao/ORBInitializer_Registry.cpp index 309110a79cc..9b74ab3f3a7 100644 --- a/TAO/tao/ORBInitializer_Registry.cpp +++ b/TAO/tao/ORBInitializer_Registry.cpp @@ -42,7 +42,7 @@ namespace PortableInterceptor ("ORBInitializer_Registry", true); // only look in the local repo #if !defined (TAO_AS_STATIC_LIBS) - if (orbinitializer_registry_ == 0) + if (orbinitializer_registry_ == nullptr) { ACE_Service_Config::process_directive ( ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("ORBInitializer_Registry", @@ -56,7 +56,7 @@ namespace PortableInterceptor } #endif /* !TAO_AS_STATIC_LIBS */ - if (orbinitializer_registry_ != 0) + if (orbinitializer_registry_ != nullptr) { orbinitializer_registry_->register_orb_initializer (init); } diff --git a/TAO/tao/ORBInitializer_Registry_Adapter.cpp b/TAO/tao/ORBInitializer_Registry_Adapter.cpp index 874bca2e5fc..aac674bc9d7 100644 --- a/TAO/tao/ORBInitializer_Registry_Adapter.cpp +++ b/TAO/tao/ORBInitializer_Registry_Adapter.cpp @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - ORBInitializer_Registry_Adapter::~ORBInitializer_Registry_Adapter (void) + ORBInitializer_Registry_Adapter::~ORBInitializer_Registry_Adapter () { } } diff --git a/TAO/tao/ORBInitializer_Registry_Adapter.h b/TAO/tao/ORBInitializer_Registry_Adapter.h index 69b2f23f059..7c973c2b44f 100644 --- a/TAO/tao/ORBInitializer_Registry_Adapter.h +++ b/TAO/tao/ORBInitializer_Registry_Adapter.h @@ -46,7 +46,7 @@ namespace TAO : public ACE_Service_Object { public: - virtual ~ORBInitializer_Registry_Adapter (void); + virtual ~ORBInitializer_Registry_Adapter (); /// Register an ORBInitializer with the underlying ORBInitializer /// array. diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index e91407c0d79..cb2d45bff86 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -91,7 +91,7 @@ ACE_FACTORY_DEFINE (TAO, TAO_ORB_Core_Static_Resources) // **************************************************************** CORBA::Environment& -TAO_default_environment (void) +TAO_default_environment () { return *TAO_TSS_Resources::instance ()->default_environment_; } @@ -111,14 +111,14 @@ TAO_ORB_Core_Static_Resources::initialization_reference_ = TAO_ORB_Core_Static_Resources::instance (); TAO_ORB_Core_Static_Resources* -TAO_ORB_Core_Static_Resources::instance (void) +TAO_ORB_Core_Static_Resources::instance () { ACE_Service_Gestalt *current = ACE_Service_Config::current(); TAO_ORB_Core_Static_Resources* tocsr = ACE_Dynamic_Service<TAO_ORB_Core_Static_Resources>::instance (current, "TAO_ORB_Core_Static_Resources", true); - if (tocsr == 0) + if (tocsr == nullptr) { // This new is never freed on purpose. The data specified by // it needs to be around for the last shared library that references @@ -136,7 +136,7 @@ TAO_ORB_Core_Static_Resources::instance (void) ACE_Dynamic_Service<TAO_ORB_Core_Static_Resources>::instance (global,"TAO_ORB_Core_Static_Resources"); - if (global_tocsr != 0) + if (global_tocsr != nullptr) *tocsr = *global_tocsr; } } @@ -144,17 +144,17 @@ TAO_ORB_Core_Static_Resources::instance (void) return tocsr; } -TAO_ORB_Core_Static_Resources::TAO_ORB_Core_Static_Resources (void) +TAO_ORB_Core_Static_Resources::TAO_ORB_Core_Static_Resources () : network_priority_protocols_hooks_name_ ( "Network_Priority_Protocols_Hooks"), - connection_timeout_hook_ (0), + connection_timeout_hook_ (nullptr), resource_factory_name_ ("Resource_Factory"), dynamic_adapter_name_ ("Dynamic_Adapter"), ifr_client_adapter_name_ ("IFR_Client_Adapter"), typecodefactory_adapter_name_ ("TypeCodeFactory_Adapter"), iorinterceptor_adapter_factory_name_ ("IORInterceptor_Adapter_Factory"), valuetype_adapter_factory_name_ ("Valuetype_Adapter_Factory"), - alt_connection_timeout_hook_ (0) + alt_connection_timeout_hook_ (nullptr) { } @@ -180,18 +180,18 @@ TAO_ORB_Core_Static_Resources::operator=(const TAO_ORB_Core_Static_Resources& ot TAO_ORB_Core::TAO_ORB_Core (const char *orbid, ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> gestalt) - : protocols_hooks_ (0), - network_priority_protocols_hooks_ (0), + : protocols_hooks_ (nullptr), + network_priority_protocols_hooks_ (nullptr), #if TAO_USE_LOCAL_MEMORY_POOL == 1 use_local_memory_pool_ (true), #else use_local_memory_pool_ (false), #endif lock_ (), - thread_lane_resources_manager_ (0), - collocation_resolver_ (0), - stub_factory_ (0), - protocol_factories_ (0), + thread_lane_resources_manager_ (nullptr), + collocation_resolver_ (nullptr), + stub_factory_ (nullptr), + protocol_factories_ (nullptr), implrepo_service_ (CORBA::Object::_nil ()), use_implrepo_ (0), imr_endpoints_in_ior_ (1), @@ -210,9 +210,9 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid, object_ref_table_ (), object_key_table_ (), orbid_ (ACE_OS::strdup (orbid ? orbid : "")), - resource_factory_ (0), - client_factory_ (0), - server_factory_ (0), + resource_factory_ (nullptr), + client_factory_ (nullptr), + server_factory_ (nullptr), ft_send_extended_sc_ (false), opt_for_collocation_ (true), use_global_collocation_ (true), @@ -220,15 +220,15 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid, #if (TAO_HAS_CORBA_MESSAGING == 1) - policy_manager_ (0), - default_policies_ (0), - policy_current_ (0), + policy_manager_ (nullptr), + default_policies_ (nullptr), + policy_current_ (nullptr), #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ poa_current_ (), adapter_registry_ (this), - poa_adapter_ (0), + poa_adapter_ (nullptr), tm_ (), tss_cleanup_funcs_ (), tss_resources_ (), @@ -239,33 +239,33 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid, // can only be initialized once. thread_per_connection_use_timeout_ (1), open_lock_ (), - endpoint_selector_factory_ (0), + endpoint_selector_factory_ (nullptr), #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) - eager_transport_queueing_strategy_ (0), - delayed_transport_queueing_strategy_ (0), - flush_transport_queueing_strategy_ (0), + eager_transport_queueing_strategy_ (nullptr), + delayed_transport_queueing_strategy_ (nullptr), + flush_transport_queueing_strategy_ (nullptr), #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ refcount_ (1), - policy_factory_registry_ (0), - orbinitializer_registry_ (0), + policy_factory_registry_ (nullptr), + orbinitializer_registry_ (nullptr), #if (TAO_HAS_INTERCEPTORS == 1) pi_current_ (CORBA::Object::_nil ()), - client_request_interceptor_adapter_ (0), - server_request_interceptor_adapter_ (0), + client_request_interceptor_adapter_ (nullptr), + server_request_interceptor_adapter_ (nullptr), #endif /* TAO_HAS_INTERCEPTORS == 1 */ - ior_interceptor_adapter_ (0), - valuetype_adapter_ (0), + ior_interceptor_adapter_ (nullptr), + valuetype_adapter_ (nullptr), parser_registry_ (), - bidir_adapter_ (0), + bidir_adapter_ (nullptr), bidir_giop_policy_ (0), - ziop_adapter_ (0), + ziop_adapter_ (nullptr), ziop_enabled_ (false), - flushing_strategy_ (0), - codeset_manager_ (0), + flushing_strategy_ (nullptr), + codeset_manager_ (nullptr), config_ (gestalt), - sync_scope_hook_ (0), + sync_scope_hook_ (nullptr), default_sync_scope_ (Messaging::SYNC_WITH_TRANSPORT), - timeout_hook_ (0) + timeout_hook_ (nullptr) { #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) @@ -294,7 +294,7 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid, this->set_sync_scope_hook (TAO_ORB_Core::default_sync_scope_hook); } -TAO_ORB_Core::~TAO_ORB_Core (void) +TAO_ORB_Core::~TAO_ORB_Core () { delete this->thread_lane_resources_manager_; @@ -323,12 +323,12 @@ TAO_ORB_Core::~TAO_ORB_Core (void) delete this->policy_factory_registry_; // Don't delete, is a process wide singleton shared by all orbs - orbinitializer_registry_ = 0; + orbinitializer_registry_ = nullptr; ::CORBA::release (this->orb_); delete this->codeset_manager_; - this->codeset_manager_ = 0; + this->codeset_manager_ = nullptr; // This will destroy the service repository for this core (void) TAO::ORB::close_services (this->config_); @@ -434,19 +434,19 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) // the "-ORBUseIMR" command line argument. // char* const use_IMR_env_var_value = ACE_OS::getenv ("TAO_USE_IMR") ; - if (use_IMR_env_var_value != 0) + if (use_IMR_env_var_value != nullptr) { this->use_implrepo_ = ACE_OS::atoi (use_IMR_env_var_value) ; } while (arg_shifter.is_anything_left ()) { - const ACE_TCHAR *current_arg = 0; + const ACE_TCHAR *current_arg = nullptr; //////////////////////////////////////////////////////////////// // begin with the 'parameterless' flags // //////////////////////////////////////////////////////////////// - if (0 != (current_arg = arg_shifter.get_the_parameter + if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBDottedDecimalAddresses")))) { // Use dotted decimal addresses @@ -456,7 +456,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBNoServerSideNameLookups")))) { // Don't look up the host name for incoming connections @@ -465,7 +465,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBNameServicePort")))) { // Specify the port number for the NameService. @@ -475,7 +475,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBMulticastDiscoveryEndpoint")))) { // Specify mcast address:port@network_interface for the @@ -488,7 +488,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBNodelay")))) { // Use TCP_NODELAY or not. @@ -497,7 +497,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBKeepalive")))) { // Use SO_KEEPALIVE or not. @@ -506,7 +506,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBDontRoute")))) { // Use SO_DONTROUTE or not. @@ -515,7 +515,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBIPHopLimit")))) { // Number of IP hops. @@ -524,7 +524,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBIPMulticastLoop")))) { // Use IP_MULTICAST_LOOP or not. @@ -533,7 +533,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBTradingServicePort")))) { // Specify the port number for the TradingService. @@ -542,7 +542,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBImplRepoServicePort")))) { // Specify the multicast port number for the Implementation @@ -551,7 +551,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBRcvSock")))) { // @@ All protocol implementation may not use sockets, so @@ -564,7 +564,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBSndSock")))) { // @@ All protocol implementation may not use sockets, so @@ -576,7 +576,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBObjRefStyle")))) { // Specifies the style of printed objrefs: URL or IOR @@ -606,7 +606,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBCollocationStrategy")))) { // Specify which collocation policy we want to use. @@ -626,7 +626,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBCollocation")))) { // Specify whether we want to optimize against collocation @@ -658,21 +658,21 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBIIOPClientPortBase")))) { this->orb_params ()->iiop_client_port_base (ACE_OS::atoi (current_arg)); arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBIIOPClientPortSpan")))) { this->orb_params ()->iiop_client_port_span (ACE_OS::atoi (current_arg)); arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBPreferredInterfaces"))) || - 0 != (current_arg = arg_shifter.get_the_parameter + nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBPreferredInterface"))) ) { if (this->orb_params ()->preferred_interfaces ( @@ -685,9 +685,9 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBEnforcePreferredInterfaces"))) || - 0 != (current_arg = arg_shifter.get_the_parameter + nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBEnforcePreferredInterface"))) ) { this->orb_params ()->enforce_pref_interfaces ( @@ -698,7 +698,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBPreferIPV6Interfaces")))) { - int prefer_ipv6_interfaces = ACE_OS::atoi (current_arg); + int const prefer_ipv6_interfaces = ACE_OS::atoi (current_arg); if (prefer_ipv6_interfaces) this->orb_params ()->prefer_ipv6_interfaces (true); else @@ -709,7 +709,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBConnectIPV6Only")))) { - int connect_ipv6_only = ACE_OS::atoi (current_arg); + int const connect_ipv6_only = ACE_OS::atoi (current_arg); if (connect_ipv6_only) this->orb_params ()->connect_ipv6_only (true); else @@ -720,7 +720,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBUseIPV6LinkLocal")))) { - int use_ipv6_link_local = ACE_OS::atoi (current_arg); + int const use_ipv6_link_local = ACE_OS::atoi (current_arg); if (use_ipv6_link_local) this->orb_params ()->use_ipv6_link_local (true); else @@ -729,7 +729,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) arg_shifter.consume_arg (); } #endif /* ACE_HAS_IPV6 */ - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBCDRTradeoff")))) { cdr_tradeoff = ACE_OS::atoi (current_arg); @@ -740,11 +740,11 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) // A new <ObjectID>:<IOR> mapping has been specified. This will be // used by the resolve_initial_references (). - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBInitRef")))) { const ACE_TCHAR *pos = ACE_OS::strchr (current_arg, '='); - if (pos == 0) + if (pos == nullptr) { TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("Invalid ORBInitRef argument '%s'") @@ -775,7 +775,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) } arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBDefaultInitRef")))) { // Set the list of prefixes from -ORBDefaultInitRef. @@ -784,14 +784,14 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBStdProfileComponents")))) { std_profile_components = ACE_OS::atoi (current_arg); arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBAMICollocation")))) { int const ami_collocation = ACE_OS::atoi (current_arg); @@ -802,7 +802,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBResources")))) { TAOLIB_DEBUG ((LM_WARNING, @@ -811,7 +811,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBLogFile")))) { // redirect all TAOLIB_DEBUG and TAOLIB_ERROR output to a file @@ -834,7 +834,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) #else /* ! ACE_LACKS_IOSTREAM_TOTALLY */ - ofstream* output_stream = 0; + ofstream* output_stream = nullptr; // // note: we are allocating dynamic memory here....but @@ -862,7 +862,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER); ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBVerboseLogging")))) { unsigned long const verbose_logging = ACE_OS::atoi (current_arg); @@ -894,14 +894,14 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) dynamic_cast<ACE_Logging_Strategy*> ( ACE_Dynamic_Service<ACE_Service_Object>::instance (current_arg)); - if (logging_strategy != 0) + if (logging_strategy != nullptr) { logging_strategy->reactor (this->reactor ()); } arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBUseIMR")))) { // Use IR or not. @@ -909,14 +909,14 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBIMREndpointsInIOR")))) { this->imr_endpoints_in_ior_ = ACE_OS::atoi (current_arg); arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBid")))) { // The ORBid is actually set in ORB_init(), and then passed @@ -935,7 +935,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBServerId")))) { // The this->server_id_ is to uniquely identify a server to @@ -945,21 +945,21 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBLingerTimeout")))) { linger = ACE_OS::atoi (current_arg); arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBAcceptErrorDelay")))) { accept_error_delay = ACE_OS::atoi (current_arg); arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBEndpoint")))) { // Each "endpoint" is of the form: @@ -986,7 +986,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBListenEndpoints")))) { // This option is similar to the -ORBEndPoint option. May be @@ -999,9 +999,9 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) arg_shifter.consume_arg (); } - else if ((0 != (current_arg = arg_shifter.get_the_parameter + else if ((nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBLaneEndpoint")))) || - (0 != (current_arg = arg_shifter.get_the_parameter + (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBLaneListenEndpoints"))))) { // This option is similar to the -ORBEndPoint option but @@ -1022,7 +1022,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) this->set_endpoint_helper (lane, endpoints); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBNoProprietaryActivation")))) { // This option can be used to set to not use any proprietary @@ -1035,34 +1035,34 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) throw ::CORBA::NO_IMPLEMENT (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBUseSharedProfile")))) { this->orb_params ()->shared_profile (ACE_OS::atoi (current_arg)); arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBNegotiateCodesets")))) { negotiate_codesets = (ACE_OS::atoi (current_arg)); arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBUseParallelConnects")))) { use_parallel_connects = ACE_OS::atoi (current_arg); arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBParallelConnectDelay")))) { this->orb_params ()->parallel_connect_delay (ACE_OS::atoi (current_arg)); arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBSingleReadOptimization")))) { this->orb_params ()->single_read_optimization @@ -1070,7 +1070,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBDisableRTCollocation")))) { int disable_rt_collocation = ACE_OS::atoi (current_arg); @@ -1081,31 +1081,31 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBUseLocalMemoryPool")))) { this->use_local_memory_pool_ = (0 != ACE_OS::atoi (current_arg)); arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBMaxMessageSize")))) { this->orb_params_.max_message_size (ACE_OS::atoi (current_arg)); arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBFTSendFullGroupTC")))) { this->ft_send_extended_sc_ = ACE_OS::atoi (current_arg); arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBForwardInvocationOnObjectNotExist")))) { - int forward = ACE_OS::atoi (current_arg); + int const forward = ACE_OS::atoi (current_arg); if (forward) this->orb_params_.forward_invocation_on_object_not_exist (true); else @@ -1113,81 +1113,81 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBForwardOnTransientLimit")))) { - int limit = ACE_OS::atoi (current_arg); + int const limit = ACE_OS::atoi (current_arg); this->orb_params_.forward_on_exception_limit (TAO::FOE_TRANSIENT, limit); arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBForwardOnCommFailureLimit")))) { - int limit = ACE_OS::atoi (current_arg); + int const limit = ACE_OS::atoi (current_arg); this->orb_params_.forward_on_exception_limit ( TAO::FOE_COMM_FAILURE, limit); arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBForwardOnObjectNotExistLimit")))) { - int limit = ACE_OS::atoi (current_arg); + int const limit = ACE_OS::atoi (current_arg); this->orb_params_.forward_on_exception_limit ( TAO::FOE_OBJECT_NOT_EXIST, limit); arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBForwardOnInvObjrefLimit")))) { - int limit = ACE_OS::atoi (current_arg); + int const limit = ACE_OS::atoi (current_arg); this->orb_params_.forward_on_exception_limit ( TAO::FOE_INV_OBJREF, limit); arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBForwardOnReplyClosedLimit")))) { - int limit = ACE_OS::atoi (current_arg); + int const limit = ACE_OS::atoi (current_arg); this->orb_params_.invocation_retry_params () .forward_on_reply_closed_limit_ = limit; arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBForwardDelay")))) { - int msecs = ACE_OS::atoi (current_arg); + int const msecs = ACE_OS::atoi (current_arg); ACE_Time_Value delay(0, 1000*msecs); this->orb_params_.forward_on_exception_delay (delay); arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBForwardOnceOnObjectNotExist")))) { - int forward = ACE_OS::atoi (current_arg); + int const forward = ACE_OS::atoi (current_arg); if (forward) this->orb_params_.forward_once_exception (TAO::FOE_OBJECT_NOT_EXIST); arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBForwardOnceOnCommFailure")))) { - int forward = ACE_OS::atoi (current_arg); + int const forward = ACE_OS::atoi (current_arg); if (forward) this->orb_params_.forward_once_exception (TAO::FOE_COMM_FAILURE); arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBForwardOnceOnTransient")))) { - int forward = ACE_OS::atoi (current_arg); + int const forward = ACE_OS::atoi (current_arg); if (forward) this->orb_params_.forward_once_exception (TAO::FOE_TRANSIENT); arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBForwardOnceOnInvObjref")))) { int forward = ACE_OS::atoi (current_arg); @@ -1196,14 +1196,14 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBAllowZIOPNoServerPolicies")))) { // This option takes a boolean 0 (off/dissallow) or 1 (on/allow) this->orb_params_.allow_ziop_no_server_policies (!!ACE_OS::atoi (current_arg)); arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBDynamicThreadPoolName")))) { this->orb_params_.dynamic_thread_pool_config_name (ACE_TEXT_ALWAYS_CHAR @@ -1222,7 +1222,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unknown \"-ORB\" option ") ACE_TEXT ("<%s>.\n"), - ((current_arg == 0) ? ACE_TEXT("<NULL>") + ((current_arg == nullptr) ? ACE_TEXT("<NULL>") : current_arg))); } @@ -1247,7 +1247,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) const char *env_endpoint = ACE_OS::getenv ("TAO_ORBENDPOINT"); - if (env_endpoint != 0) + if (env_endpoint != nullptr) { int result = this->orb_params ()->add_endpoints (TAO_DEFAULT_LANE, env_endpoint); @@ -1293,7 +1293,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) // services because we'll load the factory from there. TAO_Resource_Factory *trf = this->resource_factory (); - if (trf == 0) + if (trf == nullptr) { TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - %p\n"), @@ -1313,7 +1313,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) // @@ ???? // Make sure the reactor is initialized... ACE_Reactor *reactor = this->reactor (); - if (reactor == 0) + if (reactor == nullptr) { TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - %p\n"), @@ -1327,7 +1327,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) TAO_Server_Strategy_Factory *ssf = this->server_factory (); - if (ssf == 0) + if (ssf == nullptr) { TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - %p\n"), @@ -1465,7 +1465,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) (this->configuration (), ACE_TEXT_CHAR_TO_TCHAR (protocols_hooks_name)); - if (this->protocols_hooks_ != 0) + if (this->protocols_hooks_ != nullptr) { // Initialize the protocols hooks instance. this->protocols_hooks_->init_hooks (this); @@ -1477,9 +1477,9 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) this->configuration (), this->orb_params ()->poa_factory_name ()); - if (adapter_factory != 0) + if (adapter_factory != nullptr) { - adapter_factory->init (0, 0); + adapter_factory->init (0, nullptr); } // Look in the service repository for an instance of the @@ -1493,7 +1493,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) (this->configuration (), ACE_TEXT_CHAR_TO_TCHAR (network_priority_protocols_hooks_name.c_str())); - if (this->network_priority_protocols_hooks_ != 0) + if (this->network_priority_protocols_hooks_ != nullptr) { // Initialize the protocols hooks instance. this->network_priority_protocols_hooks_->init_hooks (this); @@ -1511,7 +1511,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) int -TAO_ORB_Core::fini (void) +TAO_ORB_Core::fini () { try { @@ -1565,7 +1565,7 @@ TAO_ORB_Core::fini (void) // // @todo Fix potential seg fault in // TAO_ORB_Core::thread_lane_resources_manager(). - if (this->thread_lane_resources_manager_ != 0) + if (this->thread_lane_resources_manager_ != nullptr) this->thread_lane_resources_manager_->finalize (); // Destroy the object_key table @@ -1586,7 +1586,7 @@ TAO_ORB_Core::set_resource_factory (const char *resource_factory_name) void TAO_ORB_Core::set_gui_resource_factory (TAO::GUIResource_Factory *gui_resource_factory) { - if (TAO_TSS_Resources::instance ()->gui_resource_factory_ != 0) + if (TAO_TSS_Resources::instance ()->gui_resource_factory_ != nullptr) { if (TAO_debug_level > 2) { @@ -1606,7 +1606,7 @@ TAO_ORB_Core::dynamic_adapter_name (const char *name) } const char * -TAO_ORB_Core::dynamic_adapter_name (void) +TAO_ORB_Core::dynamic_adapter_name () { return TAO_ORB_Core_Static_Resources::instance ()->dynamic_adapter_name_.c_str(); } @@ -1618,7 +1618,7 @@ TAO_ORB_Core::ifr_client_adapter_name (const char *name) } const char * -TAO_ORB_Core::ifr_client_adapter_name (void) +TAO_ORB_Core::ifr_client_adapter_name () { return TAO_ORB_Core_Static_Resources::instance ()->ifr_client_adapter_name_.c_str(); } @@ -1630,7 +1630,7 @@ TAO_ORB_Core::typecodefactory_adapter_name (const char *name) } const char * -TAO_ORB_Core::typecodefactory_adapter_name (void) +TAO_ORB_Core::typecodefactory_adapter_name () { return TAO_ORB_Core_Static_Resources::instance ()->typecodefactory_adapter_name_.c_str(); } @@ -1642,7 +1642,7 @@ TAO_ORB_Core::iorinterceptor_adapter_factory_name (const char *name) } const char * -TAO_ORB_Core::iorinterceptor_adapter_factory_name (void) +TAO_ORB_Core::iorinterceptor_adapter_factory_name () { return TAO_ORB_Core_Static_Resources::instance ()->iorinterceptor_adapter_factory_name_.c_str(); } @@ -1654,16 +1654,16 @@ TAO_ORB_Core::valuetype_adapter_factory_name (const char *name) } const char * -TAO_ORB_Core::valuetype_adapter_factory_name (void) +TAO_ORB_Core::valuetype_adapter_factory_name () { return TAO_ORB_Core_Static_Resources::instance ()->valuetype_adapter_factory_name_.c_str(); } TAO_Resource_Factory * -TAO_ORB_Core::resource_factory (void) +TAO_ORB_Core::resource_factory () { // Check if there is a cached reference. - if (this->resource_factory_ != 0) + if (this->resource_factory_ != nullptr) { return this->resource_factory_; } @@ -1681,17 +1681,17 @@ TAO_ORB_Core::resource_factory (void) } TAO::GUIResource_Factory * -TAO_ORB_Core::gui_resource_factory (void) +TAO_ORB_Core::gui_resource_factory () { return TAO_TSS_Resources::instance ()->gui_resource_factory_; } TAO_Thread_Lane_Resources_Manager & -TAO_ORB_Core::thread_lane_resources_manager (void) +TAO_ORB_Core::thread_lane_resources_manager () { // Check if there is a cached reference. - if (this->thread_lane_resources_manager_ != 0) + if (this->thread_lane_resources_manager_ != nullptr) return *this->thread_lane_resources_manager_; // If not, lookup the corresponding factory and ask it to make one. @@ -1710,10 +1710,10 @@ TAO_ORB_Core::thread_lane_resources_manager (void) } TAO_Collocation_Resolver & -TAO_ORB_Core::collocation_resolver (void) +TAO_ORB_Core::collocation_resolver () { // Check if there is a cached reference. - if (this->collocation_resolver_ != 0) + if (this->collocation_resolver_ != nullptr) return *this->collocation_resolver_; // If not, lookup it up. @@ -1726,7 +1726,7 @@ TAO_ORB_Core::collocation_resolver (void) } TAO::PolicyFactory_Registry_Adapter * -TAO_ORB_Core::policy_factory_registry_i (void) +TAO_ORB_Core::policy_factory_registry_i () { TAO_PolicyFactory_Registry_Factory *loader = @@ -1734,7 +1734,7 @@ TAO_ORB_Core::policy_factory_registry_i (void) (this->configuration (), ACE_TEXT ("PolicyFactory_Loader")); - if (loader == 0) + if (loader == nullptr) { this->configuration ()->process_directive ( ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("PolicyFactory_Loader", @@ -1748,7 +1748,7 @@ TAO_ORB_Core::policy_factory_registry_i (void) ACE_TEXT ("PolicyFactory_Loader")); } - if (loader != 0) + if (loader != nullptr) { this->policy_factory_registry_ = loader->create (); @@ -1758,10 +1758,10 @@ TAO_ORB_Core::policy_factory_registry_i (void) } TAO_ZIOP_Adapter * -TAO_ORB_Core::ziop_adapter_i (void) +TAO_ORB_Core::ziop_adapter_i () { // Check if there is a cached reference. - if (this->ziop_adapter_ != 0) + if (this->ziop_adapter_ != nullptr) return this->ziop_adapter_; this->ziop_adapter_ = @@ -1773,7 +1773,7 @@ TAO_ORB_Core::ziop_adapter_i (void) } TAO::ORBInitializer_Registry_Adapter * -TAO_ORB_Core::orbinitializer_registry_i (void) +TAO_ORB_Core::orbinitializer_registry_i () { // @todo The ORBInitializer_Registry is supposed to be a singleton. @@ -1787,7 +1787,7 @@ TAO_ORB_Core::orbinitializer_registry_i (void) // In case we build shared, try to load the PI Client library, in a // static build we just can't do this, so don't try it, lower layers // output an error then. - if (this->orbinitializer_registry_ == 0) + if (this->orbinitializer_registry_ == nullptr) { this->configuration ()->process_directive ( ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE ("ORBInitializer_Registry", @@ -1806,10 +1806,10 @@ TAO_ORB_Core::orbinitializer_registry_i (void) } TAO_Stub_Factory * -TAO_ORB_Core::stub_factory (void) +TAO_ORB_Core::stub_factory () { // Check if there is a cached reference. - if (this->stub_factory_ != 0) + if (this->stub_factory_ != nullptr) return this->stub_factory_; // If not, look in the service repository for an instance. @@ -1825,10 +1825,10 @@ TAO_ORB_Core::stub_factory (void) } TAO_Endpoint_Selector_Factory * -TAO_ORB_Core::endpoint_selector_factory (void) +TAO_ORB_Core::endpoint_selector_factory () { // Check if there is a cached reference. - if (this->endpoint_selector_factory_ != 0) + if (this->endpoint_selector_factory_ != nullptr) return this->endpoint_selector_factory_; // If not, look in the service repository for an instance. @@ -1854,7 +1854,7 @@ TAO_ORB_Core::set_network_priority_protocols_hooks ( } void -TAO_ORB_Core::services_callbacks_init (void) +TAO_ORB_Core::services_callbacks_init () { // We (should) know what are the services that would need // callbacks. So, what we do is go through the Service Configurator @@ -1899,9 +1899,9 @@ TAO_ORB_Core::service_raise_transient_failure ( } TAO_Client_Strategy_Factory * -TAO_ORB_Core::client_factory (void) +TAO_ORB_Core::client_factory () { - if (this->client_factory_ == 0) + if (this->client_factory_ == nullptr) { // Look in the service repository for an instance. this->client_factory_ = @@ -1914,9 +1914,9 @@ TAO_ORB_Core::client_factory (void) } TAO_Server_Strategy_Factory * -TAO_ORB_Core::server_factory (void) +TAO_ORB_Core::server_factory () { - if (this->server_factory_ == 0) + if (this->server_factory_ == nullptr) { // Look in the service repository for an instance. this->server_factory_ = @@ -1929,7 +1929,7 @@ TAO_ORB_Core::server_factory (void) } CORBA::Object_ptr -TAO_ORB_Core::root_poa (void) +TAO_ORB_Core::root_poa () { // DCL .. if (CORBA::is_nil (this->root_poa_.in ())) @@ -1943,7 +1943,7 @@ TAO_ORB_Core::root_poa (void) (this->configuration (), this->orb_params ()->poa_factory_name ()); - if (factory == 0) + if (factory == nullptr) { this->configuration()->process_directive ( this->orb_params ()->poa_factory_directive ()); @@ -1954,7 +1954,7 @@ TAO_ORB_Core::root_poa (void) this->orb_params ()->poa_factory_name ()); } - if (factory == 0) + if (factory == nullptr) { return CORBA::Object::_nil (); } @@ -1962,15 +1962,11 @@ TAO_ORB_Core::root_poa (void) ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, monitor, this->open_lock_, - 0); + nullptr); if (CORBA::is_nil (this->root_poa_.in ())) { -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO_Adapter> poa_adapter (factory->create (this)); -#else - auto_ptr<TAO_Adapter> poa_adapter (factory->create (this)); -#endif /* ACE_HAS_CPP11 */ poa_adapter->open (); // @@ Not exception safe @@ -1986,12 +1982,12 @@ TAO_ORB_Core::root_poa (void) } TAO_Adapter * -TAO_ORB_Core::poa_adapter (void) +TAO_ORB_Core::poa_adapter () { - if (this->poa_adapter_ == 0) + if (this->poa_adapter_ == nullptr) { - ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0); - if (this->poa_adapter_ == 0) + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, nullptr); + if (this->poa_adapter_ == nullptr) { this->poa_adapter_ = this->adapter_registry_.find_adapter ("RootPOA"); @@ -2033,7 +2029,7 @@ TAO_ORB_Core::create_stub_object (TAO_MProfile &mprofile, // orbos\98-05-05.pdf Section 5.4) if (policy_list->length () != 0) { - TAO_Profile * profile = 0; + TAO_Profile * profile = nullptr; CORBA::ULong const count = mprofile.profile_count (); for (CORBA::ULong i = 0; i < count; ++i) @@ -2055,7 +2051,7 @@ TAO_ORB_Core::create_stub_object (TAO_MProfile &mprofile, void TAO_ORB_Core::load_policy_validators (TAO_Policy_Validator &validator) { - if (this->bidir_adapter_ == 0) + if (this->bidir_adapter_ == nullptr) { this->bidir_adapter_ = ACE_Dynamic_Service<TAO_BiDir_Adapter>::instance @@ -2085,7 +2081,7 @@ TAO_ORB_Core::create_object (TAO_Stub *stub) // @@ We should thow CORBA::NO_MEMORY in platforms with exceptions, // but we are stuck in platforms without exceptions! TAO_ORB_Core_Auto_Ptr collocated_orb_core; - CORBA::Object_ptr x = 0; + CORBA::Object_ptr x = nullptr; { // Lock the ORB_Table against concurrent modification while we @@ -2123,7 +2119,7 @@ TAO_ORB_Core::create_object (TAO_Stub *stub) // Remote one. ACE_NEW_RETURN (x, CORBA::Object (stub, 0), - 0); + nullptr); } return x; @@ -2198,7 +2194,7 @@ TAO_ORB_Core::is_collocation_enabled (TAO_ORB_Core *orb_core, { TAO_MProfile mp_temp; - TAO_Profile* profile = 0; + TAO_Profile* profile = nullptr; if (this->service_profile_selection(mp, profile) && profile) { if (mp_temp.add_profile(profile) == -1) @@ -2239,13 +2235,13 @@ TAO_ORB_Core::is_collocated (const TAO_MProfile& mprofile) // **************************************************************** TAO_Leader_Follower & -TAO_ORB_Core::leader_follower (void) +TAO_ORB_Core::leader_follower () { return this->lane_resources ().leader_follower (); } TAO_LF_Strategy & -TAO_ORB_Core::lf_strategy (void) +TAO_ORB_Core::lf_strategy () { return this->thread_lane_resources_manager ().lf_strategy (); } @@ -2333,7 +2329,7 @@ TAO_ORB_Core::run (ACE_Time_Value *tv, int perform_work) break; } if (result == 0 - && tv != 0 + && tv != nullptr && *tv == ACE_Time_Value::zero) { // A timeout, terminate the loop... @@ -2352,7 +2348,7 @@ TAO_ORB_Core::run (ACE_Time_Value *tv, int perform_work) // wait only in the parent thread. if (this->has_shutdown () == true && (this->server_factory_->activate_server_connections () || - (this->tm_.task() == 0 && this->tm_.count_threads() > 0) ) ) + (this->tm_.task() == nullptr && this->tm_.count_threads() > 0) ) ) { this->tm_.wait (); } @@ -2415,7 +2411,7 @@ TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion) ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_); delete this->valuetype_adapter_; - this->valuetype_adapter_ = 0; + this->valuetype_adapter_ = nullptr; } // Explicitly destroy the object reference table since it @@ -2436,7 +2432,7 @@ TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion) } void -TAO_ORB_Core::destroy (void) +TAO_ORB_Core::destroy () { // All destroy() should do is (a) call shutdown() and (b) unbind() // from the ORB table. Nothing else should really be added to this @@ -2472,7 +2468,7 @@ TAO_ORB_Core::destroy (void) } void -TAO_ORB_Core::check_shutdown (void) +TAO_ORB_Core::check_shutdown () { if (this->has_shutdown ()) { @@ -2485,36 +2481,36 @@ TAO_ORB_Core::check_shutdown (void) } void -TAO_ORB_Core::destroy_interceptors (void) +TAO_ORB_Core::destroy_interceptors () { try { ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_); #if TAO_HAS_INTERCEPTORS == 1 - if (this->client_request_interceptor_adapter_ != 0) + if (this->client_request_interceptor_adapter_ != nullptr) { this->client_request_interceptor_adapter_->destroy_interceptors (); delete this->client_request_interceptor_adapter_; - this->client_request_interceptor_adapter_ = 0; + this->client_request_interceptor_adapter_ = nullptr; } - if (this->server_request_interceptor_adapter_ != 0) + if (this->server_request_interceptor_adapter_ != nullptr) { this->server_request_interceptor_adapter_->destroy_interceptors (); delete this->server_request_interceptor_adapter_; - this->server_request_interceptor_adapter_ = 0; + this->server_request_interceptor_adapter_ = nullptr; } #endif /* TAO_HAS_INTERCEPTORS == 1 */ - if (this->ior_interceptor_adapter_ != 0) + if (this->ior_interceptor_adapter_ != nullptr) { this->ior_interceptor_adapter_->destroy_interceptors (); - this->ior_interceptor_adapter_ = 0; + this->ior_interceptor_adapter_ = nullptr; } } @@ -2533,20 +2529,20 @@ TAO_ORB_Core::destroy_interceptors (void) } TAO_Thread_Lane_Resources & -TAO_ORB_Core::lane_resources (void) +TAO_ORB_Core::lane_resources () { return this->thread_lane_resources_manager ().lane_resources (); } void -TAO_ORB_Core::resolve_typecodefactory_i (void) +TAO_ORB_Core::resolve_typecodefactory_i () { TAO_Object_Loader *loader = ACE_Dynamic_Service<TAO_Object_Loader>::instance (this->configuration (), ACE_TEXT ("TypeCodeFactory_Loader")); - if (loader == 0) + if (loader == nullptr) { this->configuration ()->process_directive (ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("TypeCodeFactory", @@ -2559,7 +2555,7 @@ TAO_ORB_Core::resolve_typecodefactory_i (void) (this->configuration (), ACE_TEXT ("TypeCodeFactory_Loader")); - if (loader == 0) + if (loader == nullptr) { TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Unable to instantiate ") @@ -2569,18 +2565,18 @@ TAO_ORB_Core::resolve_typecodefactory_i (void) } this->typecode_factory_ = - loader->create_object (this->orb_, 0, 0); + loader->create_object (this->orb_, 0, nullptr); } void -TAO_ORB_Core::resolve_codecfactory_i (void) +TAO_ORB_Core::resolve_codecfactory_i () { TAO_Object_Loader *loader = ACE_Dynamic_Service<TAO_Object_Loader>::instance (this->configuration (), ACE_TEXT ("CodecFactory_Loader")); - if (loader == 0) + if (loader == nullptr) { this->configuration()->process_directive (ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("CodecFactory", @@ -2593,22 +2589,22 @@ TAO_ORB_Core::resolve_codecfactory_i (void) (this->configuration (), ACE_TEXT ("CodecFactory_Loader")); } - if (loader != 0) + if (loader != nullptr) { this->codec_factory_ = - loader->create_object (this->orb_, 0, 0); + loader->create_object (this->orb_, 0, nullptr); } } void -TAO_ORB_Core::resolve_compression_manager_i (void) +TAO_ORB_Core::resolve_compression_manager_i () { TAO_Object_Loader *loader = ACE_Dynamic_Service<TAO_Object_Loader>::instance (this->configuration (), ACE_TEXT ("Compression_Loader")); - if (loader == 0) + if (loader == nullptr) { this->configuration()->process_directive (ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("Compression", @@ -2621,21 +2617,21 @@ TAO_ORB_Core::resolve_compression_manager_i (void) (this->configuration (), ACE_TEXT ("Compression_Loader")); } - if (loader != 0) + if (loader != nullptr) { - this->compression_manager_ = loader->create_object (this->orb_, 0, 0); + this->compression_manager_ = loader->create_object (this->orb_, 0, nullptr); } } void -TAO_ORB_Core::resolve_poa_current_i (void) +TAO_ORB_Core::resolve_poa_current_i () { TAO_Object_Loader *loader = ACE_Dynamic_Service<TAO_Object_Loader>::instance (this->configuration(), ACE_TEXT ("TAO_POA_Current_Factory")); - if (loader == 0) + if (loader == nullptr) { this->configuration()->process_directive (ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("TAO_POA_Current_Factory", @@ -2648,9 +2644,9 @@ TAO_ORB_Core::resolve_poa_current_i (void) (this->configuration(), ACE_TEXT ("TAO_POA_Current_Factory")); } - if (loader != 0) + if (loader != nullptr) { - this->poa_current_ = loader->create_object (this->orb_, 0, 0); + this->poa_current_ = loader->create_object (this->orb_, 0, nullptr); } } @@ -2658,14 +2654,14 @@ TAO_ORB_Core::resolve_poa_current_i (void) #if TAO_HAS_INTERCEPTORS == 1 void -TAO_ORB_Core::resolve_picurrent_i (void) +TAO_ORB_Core::resolve_picurrent_i () { TAO_Object_Loader *loader = ACE_Dynamic_Service<TAO_Object_Loader>::instance (this->configuration (), ACE_TEXT ("PICurrent_Loader")); - if (loader == 0) + if (loader == nullptr) { this->configuration ()->process_directive (ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("PICurrent_Loader", @@ -2678,9 +2674,9 @@ TAO_ORB_Core::resolve_picurrent_i (void) (this->configuration (), ACE_TEXT ("PICurrent_Loader")); } - if (loader != 0) + if (loader != nullptr) { - CORBA::Object_ptr pi = loader->create_object (this->orb_, 0, 0); + CORBA::Object_ptr pi = loader->create_object (this->orb_, 0, nullptr); this->pi_current_ = pi; } @@ -2690,14 +2686,14 @@ TAO_ORB_Core::resolve_picurrent_i (void) void -TAO_ORB_Core::resolve_dynanyfactory_i (void) +TAO_ORB_Core::resolve_dynanyfactory_i () { TAO_Object_Loader *loader = ACE_Dynamic_Service<TAO_Object_Loader>::instance (this->configuration (), ACE_TEXT ("DynamicAny_Loader")); - if (loader == 0) + if (loader == nullptr) { this->configuration ()->process_directive (ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("DynamicAny_Loader", @@ -2711,21 +2707,21 @@ TAO_ORB_Core::resolve_dynanyfactory_i (void) ACE_TEXT ("DynamicAny_Loader")); } - if (loader != 0) + if (loader != nullptr) { - this->dynany_factory_ = loader->create_object (this->orb_, 0, 0); + this->dynany_factory_ = loader->create_object (this->orb_, 0, nullptr); } } void -TAO_ORB_Core::resolve_iormanipulation_i (void) +TAO_ORB_Core::resolve_iormanipulation_i () { TAO_Object_Loader *loader = ACE_Dynamic_Service<TAO_Object_Loader>::instance (this->configuration (), ACE_TEXT ("IORManip_Loader")); - if (loader == 0) + if (loader == nullptr) { this->configuration()->process_directive (ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("IORManip_Loader", @@ -2738,19 +2734,19 @@ TAO_ORB_Core::resolve_iormanipulation_i (void) (this->configuration (), ACE_TEXT ("IORManip_Loader")); } - if (loader != 0) + if (loader != nullptr) { - this->ior_manip_factory_ = loader->create_object (this->orb_, 0, 0); + this->ior_manip_factory_ = loader->create_object (this->orb_, 0, nullptr); } } void -TAO_ORB_Core::resolve_ior_table_i (void) +TAO_ORB_Core::resolve_ior_table_i () { TAO_Adapter_Factory *factory = ACE_Dynamic_Service<TAO_Adapter_Factory>::instance (this->configuration (), ACE_TEXT("TAO_IORTable")); - if (factory == 0) + if (factory == nullptr) { this->configuration ()->process_directive (ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("TAO_IORTable", @@ -2763,7 +2759,7 @@ TAO_ORB_Core::resolve_ior_table_i (void) (this->configuration (), ACE_TEXT("TAO_IORTable")); } - if (factory != 0) + if (factory != nullptr) { ACE_Auto_Ptr <TAO_Adapter> iortable_adapter (factory->create (this)); iortable_adapter->open (); @@ -2779,12 +2775,12 @@ TAO_ORB_Core::resolve_ior_table_i (void) } void -TAO_ORB_Core::resolve_async_ior_table_i (void) +TAO_ORB_Core::resolve_async_ior_table_i () { TAO_Adapter_Factory *factory = ACE_Dynamic_Service<TAO_Adapter_Factory>::instance (this->configuration (), ACE_TEXT("TAO_Async_IORTable")); - if (factory == 0) + if (factory == nullptr) { this->configuration ()->process_directive (ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("TAO_Async_IORTable", @@ -2797,7 +2793,7 @@ TAO_ORB_Core::resolve_async_ior_table_i (void) (this->configuration (), ACE_TEXT("TAO_Async_IORTable")); } - if (factory != 0) + if (factory != nullptr) { ACE_Auto_Ptr <TAO_Adapter> iortable_adapter (factory->create (this)); iortable_adapter->open (); @@ -2813,14 +2809,14 @@ TAO_ORB_Core::resolve_async_ior_table_i (void) } void -TAO_ORB_Core::resolve_monitor_i (void) +TAO_ORB_Core::resolve_monitor_i () { TAO_Object_Loader *loader = ACE_Dynamic_Service<TAO_Object_Loader>::instance (this->configuration (), ACE_TEXT ("Monitor_Init")); - if (loader == 0) + if (loader == nullptr) { this->configuration ()->process_directive (ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("Monitor_Init", @@ -2834,9 +2830,9 @@ TAO_ORB_Core::resolve_monitor_i (void) ACE_TEXT ("Monitor_Init")); } - if (loader != 0) + if (loader != nullptr) { - this->monitor_ = loader->create_object (this->orb_, 0, 0); + this->monitor_ = loader->create_object (this->orb_, 0, nullptr); } } @@ -2918,7 +2914,7 @@ TAO_ORB_Core::resolve_rir (const char *name) } CORBA::ORB::ObjectIdList * -TAO_ORB_Core::list_initial_references (void) +TAO_ORB_Core::list_initial_references () { // Unsupported initial services should NOT be included in the below list! static const char *initial_services[] = { TAO_LIST_OF_INITIAL_SERVICES }; @@ -2933,7 +2929,7 @@ TAO_ORB_Core::list_initial_references (void) + this->init_ref_map_.size () + this->object_ref_table_.current_size (); - CORBA::ORB::ObjectIdList *tmp = 0; + CORBA::ORB::ObjectIdList *tmp = nullptr; ACE_NEW_THROW_EX (tmp, CORBA::ORB::ObjectIdList ( @@ -2976,46 +2972,46 @@ TAO_ORB_Core::list_initial_references (void) // **************************************************************** ACE_Allocator* -TAO_ORB_Core::input_cdr_dblock_allocator (void) +TAO_ORB_Core::input_cdr_dblock_allocator () { return this->lane_resources ().input_cdr_dblock_allocator (); } ACE_Allocator* -TAO_ORB_Core::input_cdr_buffer_allocator (void) +TAO_ORB_Core::input_cdr_buffer_allocator () { return this->lane_resources ().input_cdr_buffer_allocator (); } ACE_Allocator* -TAO_ORB_Core::input_cdr_msgblock_allocator (void) +TAO_ORB_Core::input_cdr_msgblock_allocator () { return this->lane_resources ().input_cdr_msgblock_allocator (); } ACE_Allocator* -TAO_ORB_Core::output_cdr_dblock_allocator (void) +TAO_ORB_Core::output_cdr_dblock_allocator () { return this->lane_resources ().output_cdr_dblock_allocator (); } ACE_Allocator* -TAO_ORB_Core::output_cdr_buffer_allocator (void) +TAO_ORB_Core::output_cdr_buffer_allocator () { return this->lane_resources ().output_cdr_buffer_allocator (); } ACE_Allocator* -TAO_ORB_Core::output_cdr_msgblock_allocator (void) +TAO_ORB_Core::output_cdr_msgblock_allocator () { return this->lane_resources ().output_cdr_msgblock_allocator (); } ACE_Allocator * -TAO_ORB_Core::transport_message_buffer_allocator (void) +TAO_ORB_Core::transport_message_buffer_allocator () { return this->lane_resources ().transport_message_buffer_allocator (); } @@ -3025,15 +3021,15 @@ ACE_Data_Block* TAO_ORB_Core::create_input_cdr_data_block (size_t size) { - ACE_Allocator *dblock_allocator = 0; - ACE_Allocator *buffer_allocator = 0; + ACE_Allocator *dblock_allocator = nullptr; + ACE_Allocator *buffer_allocator = nullptr; dblock_allocator = this->input_cdr_dblock_allocator (); buffer_allocator = this->input_cdr_buffer_allocator (); - ACE_Lock* lock_strategy = 0; + ACE_Lock* lock_strategy = nullptr; if (this->resource_factory ()->use_locked_data_blocks ()) { lock_strategy = &this->data_block_lock_; @@ -3051,7 +3047,7 @@ TAO_ORB_Core::create_data_block_i (size_t size, ACE_Allocator *dblock_allocator, ACE_Lock *lock_strategy) { - ACE_Data_Block *nb = 0; + ACE_Data_Block *nb = nullptr; ACE_NEW_MALLOC_RETURN ( nb, @@ -3059,18 +3055,18 @@ TAO_ORB_Core::create_data_block_i (size_t size, dblock_allocator->malloc (sizeof (ACE_Data_Block))), ACE_Data_Block (size, ACE_Message_Block::MB_DATA, - 0, + nullptr, buffer_allocator, lock_strategy, 0, dblock_allocator), - 0); + nullptr); return nb; } TAO_Connector_Registry * -TAO_ORB_Core::connector_registry (void) +TAO_ORB_Core::connector_registry () { TAO_Connector_Registry *conn = this->lane_resources ().connector_registry (); @@ -3088,13 +3084,13 @@ TAO_ORB_Core::fragmentation_strategy (TAO_Transport * transport) } ACE_Reactor * -TAO_ORB_Core::reactor (void) +TAO_ORB_Core::reactor () { return this->leader_follower ().reactor (); } CORBA::Object_ptr -TAO_ORB_Core::implrepo_service (void) +TAO_ORB_Core::implrepo_service () { if (!this->use_implrepo_) return CORBA::Object::_nil (); @@ -3130,7 +3126,7 @@ TAO_ORB_Core::default_sync_scope_hook (TAO_ORB_Core *oc, Messaging::SyncScope &scope) { has_synchronization = true; - scope = (oc == 0) ? Messaging::SYNC_WITH_TRANSPORT : oc->default_sync_scope_; + scope = (oc == nullptr) ? Messaging::SYNC_WITH_TRANSPORT : oc->default_sync_scope_; } void @@ -3140,7 +3136,7 @@ TAO_ORB_Core::call_sync_scope_hook (TAO_Stub *stub, { Sync_Scope_Hook sync_scope_hook = this->sync_scope_hook_; - if (sync_scope_hook == 0) + if (sync_scope_hook == nullptr) { has_synchronization = false; return; @@ -3176,7 +3172,7 @@ TAO_ORB_Core::get_transport_queueing_strategy (TAO_Stub *, break; default: { - return 0; + return nullptr; } } } @@ -3196,7 +3192,7 @@ TAO_ORB_Core::call_timeout_hook (TAO_Stub *stub, { Timeout_Hook timeout_hook = this->timeout_hook_; - if (timeout_hook == 0) + if (timeout_hook == nullptr) { has_timeout = false; return; @@ -3212,7 +3208,7 @@ TAO_ORB_Core::connection_timeout (TAO_Stub *stub, Timeout_Hook connection_timeout_hook = TAO_ORB_Core_Static_Resources::instance ()->connection_timeout_hook_; - if (connection_timeout_hook == 0) + if (connection_timeout_hook == nullptr) { has_timeout = false; return; @@ -3223,7 +3219,7 @@ TAO_ORB_Core::connection_timeout (TAO_Stub *stub, Timeout_Hook alt_connection_timeout_hook = TAO_ORB_Core_Static_Resources::instance ()->alt_connection_timeout_hook_; - if (alt_connection_timeout_hook == 0) + if (alt_connection_timeout_hook == nullptr) return; if (!has_timeout || time_value == ACE_Time_Value::zero ) @@ -3267,7 +3263,7 @@ TAO_ORB_Core::connection_timeout_hook (Timeout_Hook hook) // keep this code lockless as it always was, assuming no // simultanious overwrite will occur. - if (TOCSRi->connection_timeout_hook_ == 0) + if (TOCSRi->connection_timeout_hook_ == nullptr) { if (TAO_debug_level > 2) { @@ -3278,7 +3274,7 @@ TAO_ORB_Core::connection_timeout_hook (Timeout_Hook hook) TOCSRi->connection_timeout_hook_ = hook; } else if (TOCSRi->connection_timeout_hook_ != hook && - TOCSRi->alt_connection_timeout_hook_ == 0) + TOCSRi->alt_connection_timeout_hook_ == nullptr) { if (TAO_debug_level > 2) { @@ -3308,7 +3304,7 @@ TAO_ORB_Core::get_policy (CORBA::PolicyType type) CORBA::Policy_var result; TAO_Policy_Manager *policy_manager = this->policy_manager (); - if (policy_manager != 0) + if (policy_manager != nullptr) { result = policy_manager->get_policy (type); } @@ -3342,7 +3338,7 @@ TAO_ORB_Core::get_cached_policy (TAO_Cached_Policy_Type type) CORBA::Policy_var result; TAO_Policy_Manager *policy_manager = this->policy_manager (); - if (policy_manager != 0) + if (policy_manager != nullptr) { result = policy_manager->get_cached_policy (type); } @@ -3373,7 +3369,7 @@ TAO_ORB_Core::get_cached_policy_including_current (TAO_Cached_Policy_Type type) #endif /* (TAO_HAS_CORBA_MESSAGING == 1) */ CORBA::Environment * -TAO_ORB_Core::default_environment (void) const +TAO_ORB_Core::default_environment () const { return TAO_TSS_Resources::instance ()->default_environment_; } @@ -3404,16 +3400,16 @@ TAO_ORB_Core::add_interceptor ( } TAO_IORInterceptor_Adapter * -TAO_ORB_Core::ior_interceptor_adapter (void) +TAO_ORB_Core::ior_interceptor_adapter () { - if (this->ior_interceptor_adapter_ == 0) + if (this->ior_interceptor_adapter_ == nullptr) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, - 0); + nullptr); - if (this->ior_interceptor_adapter_ == 0) + if (this->ior_interceptor_adapter_ == nullptr) { try { @@ -3462,16 +3458,16 @@ TAO_ORB_Core::add_interceptor ( } TAO::ClientRequestInterceptor_Adapter * -TAO_ORB_Core::clientrequestinterceptor_adapter_i (void) +TAO_ORB_Core::clientrequestinterceptor_adapter_i () { - if (this->client_request_interceptor_adapter_ == 0) + if (this->client_request_interceptor_adapter_ == nullptr) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, - 0); + nullptr); - if (this->client_request_interceptor_adapter_ == 0) + if (this->client_request_interceptor_adapter_ == nullptr) { TAO_ClientRequestInterceptor_Adapter_Factory *factory = ACE_Dynamic_Service<TAO_ClientRequestInterceptor_Adapter_Factory>::instance @@ -3559,16 +3555,16 @@ TAO_ORB_Core::add_interceptor ( } TAO::ServerRequestInterceptor_Adapter * -TAO_ORB_Core::serverrequestinterceptor_adapter_i (void) +TAO_ORB_Core::serverrequestinterceptor_adapter_i () { - if (this->server_request_interceptor_adapter_ == 0) + if (this->server_request_interceptor_adapter_ == nullptr) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, - 0); + nullptr); - if (this->server_request_interceptor_adapter_ == 0) + if (this->server_request_interceptor_adapter_ == nullptr) { TAO_ServerRequestInterceptor_Adapter_Factory *factory = ACE_Dynamic_Service<TAO_ServerRequestInterceptor_Adapter_Factory>::instance @@ -3589,16 +3585,16 @@ TAO_ORB_Core::serverrequestinterceptor_adapter_i (void) #endif /* TAO_HAS_INTERCEPTORS == 1 */ TAO_Valuetype_Adapter * -TAO_ORB_Core::valuetype_adapter (void) +TAO_ORB_Core::valuetype_adapter () { - if (this->valuetype_adapter_ == 0) + if (this->valuetype_adapter_ == nullptr) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, - 0); + nullptr); - if (this->valuetype_adapter_ == 0) + if (this->valuetype_adapter_ == nullptr) { try { @@ -3618,7 +3614,7 @@ TAO_ORB_Core::valuetype_adapter (void) } } - if (this->valuetype_adapter_ == 0) + if (this->valuetype_adapter_ == nullptr) { throw ::CORBA::INTERNAL (); } @@ -3638,11 +3634,11 @@ TAO_ORB_Core::register_value_factory (const char *repository_id, { if (this->valuetype_adapter ()) { - ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, nullptr); - if (this->valuetype_adapter_ == 0) + if (this->valuetype_adapter_ == nullptr) { - return 0; + return nullptr; } int const result = @@ -3650,7 +3646,7 @@ TAO_ORB_Core::register_value_factory (const char *repository_id, if (result == 0) // No previous factory found { - return 0; + return nullptr; } if (result == -1) @@ -3672,7 +3668,7 @@ TAO_ORB_Core::unregister_value_factory (const char *repository_id) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); - if (this->valuetype_adapter_ == 0) + if (this->valuetype_adapter_ == nullptr) { return; } @@ -3689,34 +3685,34 @@ TAO_ORB_Core::lookup_value_factory (const char *repository_id) { if (this->valuetype_adapter ()) { - ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, nullptr); - if (this->valuetype_adapter_ == 0) + if (this->valuetype_adapter_ == nullptr) { - return 0; + return nullptr; } return this->valuetype_adapter_->vf_map_find (repository_id); } - return 0; + return nullptr; } #endif // **************************************************************** TAO_Export TAO_ORB_Core * -TAO_ORB_Core_instance (void) +TAO_ORB_Core_instance () { // @@ This is a slight violation of layering, we should use // TAO_ORB_Core_instance(), but that breaks during startup. TAO::ORB_Table * const orb_table = TAO::ORB_Table::instance (); - if (orb_table->first_orb () == 0) + if (orb_table->first_orb () == nullptr) { ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, guard, - *ACE_Static_Object_Lock::instance (), 0)); + *ACE_Static_Object_Lock::instance (), nullptr)); - if (orb_table->first_orb () == 0) + if (orb_table->first_orb () == nullptr) { // Calling CORBA::ORB_init() returns a duplicated ORB // reference, so make sure that reference is stored in an @@ -3729,7 +3725,7 @@ TAO_ORB_Core_instance (void) try { int argc = 0; - ACE_TCHAR **const argv= 0; + ACE_TCHAR **const argv= nullptr; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); } diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h index f29cd02430d..35b2b599763 100644 --- a/TAO/tao/ORB_Core.h +++ b/TAO/tao/ORB_Core.h @@ -41,11 +41,7 @@ #include "ace/Lock_Adapter_T.h" #include "ace/TSS_T.h" #include "ace/Service_Config.h" -#if defined (ACE_HAS_CPP11) -# include <atomic> -#else -# include "ace/Atomic_Op.h" -#endif /* ACE_HAS_CPP11 */ +#include <atomic> ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Data_Block; @@ -171,7 +167,7 @@ public: TAO_ORB_Core (const char* id, ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> g); /// Accessor for the ORB parameters. - TAO_ORB_Parameters *orb_params (void); + TAO_ORB_Parameters *orb_params (); /** * @todo @@ -186,46 +182,46 @@ public: */ /// Accessor to the POA current. //@{ - CORBA::Object_ptr poa_current(void); + CORBA::Object_ptr poa_current(); //@} /// Get the connector registry - TAO_Connector_Registry *connector_registry (void); + TAO_Connector_Registry *connector_registry (); /// Get the IOR parser registry - TAO_Parser_Registry *parser_registry (void); + TAO_Parser_Registry *parser_registry (); /// Return pointer to the policy factory registry associated with /// this ORB core. - TAO::PolicyFactory_Registry_Adapter *policy_factory_registry (void); + TAO::PolicyFactory_Registry_Adapter *policy_factory_registry (); /// Return pointer to the orb initializer registry associated with /// this ORB core. Tries to load the PI library if it is not loaded /// yet - TAO::ORBInitializer_Registry_Adapter *orbinitializer_registry (void); + TAO::ORBInitializer_Registry_Adapter *orbinitializer_registry (); TAO_ZIOP_Adapter *ziop_adapter () const; void ziop_adapter (TAO_ZIOP_Adapter *adapter); - TAO_Service_Context_Registry &service_context_registry (void); + TAO_Service_Context_Registry &service_context_registry (); /// Get the protocol factories - TAO_ProtocolFactorySet *protocol_factories (void); + TAO_ProtocolFactorySet *protocol_factories (); /// Get pointer to the ORB. - CORBA::ORB_ptr orb (void); + CORBA::ORB_ptr orb (); /// Wrappers that forward the request to the concurrency strategy. - ACE_Reactor *reactor (void); + ACE_Reactor *reactor (); /// Get the ACE_Thread_Manager - ACE_Thread_Manager *thr_mgr (void); + ACE_Thread_Manager *thr_mgr (); /// Return the RootPOA, or try to load it if not initialized already. - CORBA::Object_ptr root_poa (void); + CORBA::Object_ptr root_poa (); /// Get the adapter registry - TAO_Adapter_Registry &adapter_registry (void); + TAO_Adapter_Registry &adapter_registry (); /// @name Collocation Strategies as configured by the user //@{ @@ -250,17 +246,17 @@ public: /// Set/get the collocation flags //@{ void optimize_collocation_objects (CORBA::Boolean opt); - CORBA::Boolean optimize_collocation_objects (void) const; + CORBA::Boolean optimize_collocation_objects () const; void use_global_collocation (CORBA::Boolean opt); - CORBA::Boolean use_global_collocation (void) const; + CORBA::Boolean use_global_collocation () const; - CORBA::ULong get_collocation_strategy (void) const; + CORBA::ULong get_collocation_strategy () const; //@} /// Get the adapter named "RootPOA" and cache the result, this is an /// optimization for the POA. - TAO_Adapter *poa_adapter (void); + TAO_Adapter *poa_adapter (); /** * @name Access to Factories @@ -272,31 +268,31 @@ public: */ //@{ /// Returns pointer to the resource factory. - TAO_Resource_Factory *resource_factory (void); + TAO_Resource_Factory *resource_factory (); /// Returns pointer to the factory for creating gui resources - TAO::GUIResource_Factory *gui_resource_factory (void); + TAO::GUIResource_Factory *gui_resource_factory (); /// Returns pointer to the client factory. - TAO_Client_Strategy_Factory *client_factory (void); + TAO_Client_Strategy_Factory *client_factory (); /// Returns pointer to the server factory. - TAO_Server_Strategy_Factory *server_factory (void); + TAO_Server_Strategy_Factory *server_factory (); /// Returns pointer to the Protocols_Hooks. - TAO_Protocols_Hooks *protocols_hooks (void); + TAO_Protocols_Hooks *protocols_hooks (); /// Returns a pointer to the Thread Lane Resources Manager. - TAO_Thread_Lane_Resources_Manager &thread_lane_resources_manager (void); + TAO_Thread_Lane_Resources_Manager &thread_lane_resources_manager (); /// Returns a pointer to the Collocation Resolver. - TAO_Collocation_Resolver &collocation_resolver (void); + TAO_Collocation_Resolver &collocation_resolver (); /// Returns a pointer to the Stub factory. - TAO_Stub_Factory *stub_factory (void); + TAO_Stub_Factory *stub_factory (); /// Returns a pointer to the endpoint selector factory. - TAO_Endpoint_Selector_Factory *endpoint_selector_factory (void); + TAO_Endpoint_Selector_Factory *endpoint_selector_factory (); //@} @@ -315,41 +311,41 @@ public: const char *network_priority_protocols_hooks_name); /// Gets the value of TAO_ORB_Core::protocols_hooks__ - TAO_Protocols_Hooks * get_protocols_hooks (void); + TAO_Protocols_Hooks * get_protocols_hooks (); /// Gets the value of TAO_ORB_Core::network_priority_protocols_hooks__ TAO_Network_Priority_Protocols_Hooks * - get_network_priority_protocols_hooks (void); + get_network_priority_protocols_hooks (); /// Sets the value of TAO_ORB_Core::dynamic_adapter_name_. static void dynamic_adapter_name (const char *name); /// Gets the value of TAO_ORB_Core::dynamic_adapter_name_. - static const char *dynamic_adapter_name (void); + static const char *dynamic_adapter_name (); /// Sets the value of TAO_ORB_Core::ifr_client_adapter_name_. static void ifr_client_adapter_name (const char *name); /// Gets the value of TAO_ORB_Core::ifr_client_adapter_name_. - static const char *ifr_client_adapter_name (void); + static const char *ifr_client_adapter_name (); /// Sets the value of TAO_ORB_Core::typecodefactory_adapter_name_. static void typecodefactory_adapter_name (const char *name); /// Gets the value of TAO_ORB_Core::typecodefactory_adapter_name_. - static const char *typecodefactory_adapter_name (void); + static const char *typecodefactory_adapter_name (); /// Sets the value of TAO_ORB_Core::iorinterceptor_adapter_factory_name_. static void iorinterceptor_adapter_factory_name (const char *name); /// Gets the value of TAO_ORB_Core::iorinterceptor_adapter_factory_name_. - static const char *iorinterceptor_adapter_factory_name (void); + static const char *iorinterceptor_adapter_factory_name (); /// Sets the value of TAO_ORB_Core::valuetype_adapter_factory_name. static void valuetype_adapter_factory_name (const char *name); /// Gets the value of TAO_ORB_Core::valuetype_adapter_factory_name. - static const char *valuetype_adapter_factory_name (void); + static const char *valuetype_adapter_factory_name (); /// See if we have a collocated address, if yes, return the POA /// associated with the address. @@ -358,46 +354,46 @@ public: /// This allocator is always TSS and has no locks. It is intended /// for allocating the ACE_Data_Blocks used in *outgoing* CDR /// streams. - ACE_Allocator *output_cdr_dblock_allocator (void); + ACE_Allocator *output_cdr_dblock_allocator (); /// This allocator is always TSS and has no locks. It is intended /// for allocating the buffers used in *outgoing* CDR streams. - ACE_Allocator *output_cdr_buffer_allocator (void); + ACE_Allocator *output_cdr_buffer_allocator (); /// This allocator is always TSS and has no locks. It is intended /// for allocating the ACE_Data_Blocks used in *outgoing* CDR /// streams. - ACE_Allocator *output_cdr_msgblock_allocator (void); + ACE_Allocator *output_cdr_msgblock_allocator (); /// This allocator is global, may or may not have locks. It is /// intended for allocating the ACE_Data_Blocks used in *incoming* /// CDR streams. - ACE_Allocator *input_cdr_dblock_allocator (void); + ACE_Allocator *input_cdr_dblock_allocator (); /// This allocator is always global and has no locks. It is intended /// for allocating the buffers used in *incoming* CDR streams. - ACE_Allocator *input_cdr_buffer_allocator (void); + ACE_Allocator *input_cdr_buffer_allocator (); /// This allocator is always global and has no locks. It is intended /// for allocating the buffers used in *incoming* CDR streams. - ACE_Allocator *input_cdr_msgblock_allocator (void); + ACE_Allocator *input_cdr_msgblock_allocator (); /// This allocator is always global and has no locks. It is intended /// for allocating the buffers used to queue messages in /// transports. - ACE_Allocator *transport_message_buffer_allocator (void); + ACE_Allocator *transport_message_buffer_allocator (); /// The Message Blocks used for input CDRs must have appropriate /// locking strategies. ACE_Data_Block *create_input_cdr_data_block (size_t size); /// Return the locking strategy used for the data blocks. - ACE_Lock *locking_strategy (void); + ACE_Lock *locking_strategy (); #if (TAO_HAS_CORBA_MESSAGING == 1) /// Accessor method for the default_policies_ - TAO_Policy_Set *get_default_policies (void); + TAO_Policy_Set *get_default_policies (); /// Get a policy. First, check the ORB-level Policy Manager, then /// check the ORB defaults. @@ -437,19 +433,19 @@ public: * tradeoffs and take a decision. */ //@{ - CORBA::Environment *default_environment (void) const; + CORBA::Environment *default_environment () const; void default_environment (CORBA::Environment*); //@} #if (TAO_HAS_CORBA_MESSAGING == 1) /// Return the Policy_Manager for this ORB. - TAO_Policy_Manager *policy_manager (void); + TAO_Policy_Manager *policy_manager (); /// Accesors to the policy current, this object should be kept in /// TSS storage. The POA has to reset the policy current object on /// every upcall. - TAO_Policy_Current &policy_current (void); + TAO_Policy_Current &policy_current (); #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ @@ -540,7 +536,7 @@ public: Messaging::SyncScope &scope); /// Return the default sync scope configured for this ORB - Messaging::SyncScope default_sync_scope (void); + Messaging::SyncScope default_sync_scope (); /// Handle to the factory for protocols_hooks_.. TAO_Protocols_Hooks *protocols_hooks_; @@ -549,7 +545,7 @@ public: TAO_Network_Priority_Protocols_Hooks *network_priority_protocols_hooks_; /// Obtain the TSS resources of this orb. - TAO_ORB_Core_TSS_Resources* get_tss_resources (void); + TAO_ORB_Core_TSS_Resources* get_tss_resources (); /// Obtain the TSS resource in the given slot. void* get_tss_resource (size_t slot_id); @@ -567,13 +563,13 @@ public: void tss_cleanup (ACE_Array_Base<void *> &ts_objects); /// Get access to the leader_follower class. - TAO_Leader_Follower &leader_follower (void); + TAO_Leader_Follower &leader_follower (); /// Get access to the leader follower strategy. - TAO_LF_Strategy &lf_strategy (void); + TAO_LF_Strategy &lf_strategy (); /// Get access to the thread lane resources. - TAO_Thread_Lane_Resources &lane_resources (void); + TAO_Thread_Lane_Resources &lane_resources (); /// Run the event loop. int run (ACE_Time_Value *tv, int perform_work); @@ -582,13 +578,13 @@ public: void shutdown (CORBA::Boolean wait_for_completion); /// Get the shutdown flag value - bool has_shutdown (void) const; + bool has_shutdown () const; /// Shutdown the ORB and free resources - void destroy (void); + void destroy (); /// Check if ORB has shutdown. If it has, throw an exception. - void check_shutdown (void); + void check_shutdown (); /// Returns the @a timeout value used by the server threads to poll /// the shutdown flag. If the return value is zero then the server @@ -602,7 +598,7 @@ public: CORBA::PolicyList *policy_list); /// Factory method that create the "right" Stub depending on - /// wheather RTCORBA is loaded or not. The factory used to create + /// whether RTCORBA is loaded or not. The factory used to create /// the stub, is loaded at ORB initialization, and its type depends /// on the fact that RTCORBA is being used or not. TAO_Stub *create_stub (const char *repository_id, @@ -628,53 +624,53 @@ public: CORBA::Long reinitialize_object (TAO_Stub *stub); /// Return ORBid string. - const char *orbid (void) const; + const char *orbid () const; /// Set/Get the IOR of the Implementation Repository service. //@{ - CORBA::Object_ptr implrepo_service (void); + CORBA::Object_ptr implrepo_service (); void implrepo_service (const CORBA::Object_ptr ir); //@} /// Do we attempt to register with the Implementation Repository - CORBA::Boolean use_implrepo (void); + CORBA::Boolean use_implrepo (); /// Do we put the ImR's endpoints into persistent object references we create - CORBA::Boolean imr_endpoints_in_ior (void); + CORBA::Boolean imr_endpoints_in_ior (); /// Resolve the TypeCodeFactory DLL. - CORBA::Object_ptr resolve_typecodefactory (void); + CORBA::Object_ptr resolve_typecodefactory (); #if TAO_HAS_INTERCEPTORS == 1 /// Resolve the PICurrent. - CORBA::Object_ptr resolve_picurrent (void); + CORBA::Object_ptr resolve_picurrent (); #endif /* TAO_HAS_INTERCEPTORS == 1 */ /// Resolve POA Current. - CORBA::Object_ptr resolve_poa_current (void); + CORBA::Object_ptr resolve_poa_current (); /// Resolve the CodecFactory DLL. - CORBA::Object_ptr resolve_codecfactory (void); + CORBA::Object_ptr resolve_codecfactory (); /// Resolve the Compression DLL. - CORBA::Object_ptr resolve_compression_manager (void); + CORBA::Object_ptr resolve_compression_manager (); /// Resolve the Dynamic Any Factory - CORBA::Object_ptr resolve_dynanyfactory (void); + CORBA::Object_ptr resolve_dynanyfactory (); /// Resolve the IOR Manipulation reference for this ORB. - CORBA::Object_ptr resolve_ior_manipulation (void); + CORBA::Object_ptr resolve_ior_manipulation (); - TAO_ZIOP_Adapter* ziop_adapter_i (void); + TAO_ZIOP_Adapter* ziop_adapter_i (); /// Resolve the IOR Table reference for this ORB. - CORBA::Object_ptr resolve_ior_table (void); + CORBA::Object_ptr resolve_ior_table (); /// Resolve the Async IOR Table reference for this ORB. - CORBA::Object_ptr resolve_async_ior_table (void); + CORBA::Object_ptr resolve_async_ior_table (); /// Resolve the Monitor reference for this ORB. - CORBA::Object_ptr resolve_monitor (void); + CORBA::Object_ptr resolve_monitor (); /// Resolve an initial reference via the -ORBInitRef and // -ORBDefaultInitRef options. @@ -682,20 +678,20 @@ public: #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 /// Resolve the RT ORB reference for this ORB. - CORBA::Object_ptr resolve_rt_orb (void); + CORBA::Object_ptr resolve_rt_orb (); #endif /// Resolve the RT Current flyweight for this ORB. /// Return server_id string. - const char *server_id (void) const; + const char *server_id () const; /// List all the service known by the ORB - CORBA::ORB_ObjectIdList *list_initial_references (void); + CORBA::ORB_ObjectIdList *list_initial_references (); /// Reference counting... - unsigned long _incr_refcnt (void); - unsigned long _decr_refcnt (void); - unsigned long _refcnt (void) const; + unsigned long _incr_refcnt (); + unsigned long _decr_refcnt (); + unsigned long _refcnt () const; /// Register the handle of an open connection with the ORB Core /// handle set. This handle set will be used to explicitly remove @@ -748,12 +744,12 @@ public: CORBA::ULong hash_service (TAO_Profile *this_p, CORBA::ULong max); /// Return a reference to the Fault Tolerant service object. - TAO_Fault_Tolerance_Service &fault_tolerance_service (void); + TAO_Fault_Tolerance_Service &fault_tolerance_service (); /// Transmit the entire TAG_FT_GROUP component data from a server IOGR as /// a FT_GROUP_VERSION tagged service context on requests to that IOGR instead /// of just the group version. - CORBA::Boolean ft_send_extended_sc (void); + CORBA::Boolean ft_send_extended_sc (); /// Raise a comm failure exception if a service is not loaded, else /// delegate to the service to see what the service has to do for @@ -782,7 +778,7 @@ public: #if TAO_HAS_INTERCEPTORS == 1 /// Return a pointer to the cached TAO::PICurrent object. - CORBA::Object_ptr pi_current (void); + CORBA::Object_ptr pi_current (); /// Set the pointer to the cached TAO::PICurrent object. void pi_current (CORBA::Object_ptr current); @@ -807,11 +803,11 @@ public: /// Get the Client Request Interceptor adapter. /// Will not create a new one if not available yet. - TAO::ClientRequestInterceptor_Adapter *clientrequestinterceptor_adapter (void); + TAO::ClientRequestInterceptor_Adapter *clientrequestinterceptor_adapter (); /// Get the Server Request Interceptor adapter. /// Will not create a new one if not available yet. - TAO::ServerRequestInterceptor_Adapter *serverrequestinterceptor_adapter (void); + TAO::ServerRequestInterceptor_Adapter *serverrequestinterceptor_adapter (); #endif /* TAO_HAS_INTERCEPTORS */ @@ -820,7 +816,7 @@ public: //@} /// Return the valuetype adapter - TAO_Valuetype_Adapter *valuetype_adapter (void); + TAO_Valuetype_Adapter *valuetype_adapter (); #if !defined(CORBA_E_MICRO) /// Value factory operations (CORBA 2.3 ptc/98-10-05 Ch. 4.2 p.4-7) @@ -839,25 +835,25 @@ public: /// Get the IOR Interceptor adapter. If not created, this method will try /// to create one. - TAO_IORInterceptor_Adapter *ior_interceptor_adapter (void); + TAO_IORInterceptor_Adapter *ior_interceptor_adapter (); /// Set and Get methods to indicate whether a BiDir IIOP policy has /// been set in the POA. /// @note At present, the value will be true even if one of the POA's /// is set with the Bi Dir GIOP policy. - CORBA::Boolean bidir_giop_policy (void); + CORBA::Boolean bidir_giop_policy (); void bidir_giop_policy (CORBA::Boolean); /// Return the table that maps object key/name to de-stringified /// object reference. It is needed for supporting local objects in /// the resolve_initial_references() mechanism. - TAO_Object_Ref_Table &object_ref_table (void); + TAO_Object_Ref_Table &object_ref_table (); /// Acceessor to the table that stores the object_keys. - TAO::ObjectKey_Table &object_key_table (void); + TAO::ObjectKey_Table &object_key_table (); /// Return the current request dispatcher strategy. - TAO_Request_Dispatcher *request_dispatcher (void); + TAO_Request_Dispatcher *request_dispatcher (); /// Set a new request dispatcher. The ORB Core retains ownership /// of the request dispatcher once it gets it. Currently, this only @@ -876,15 +872,15 @@ public: * The flushing strategies are stateless, therefore, there is only * one per ORB. */ - TAO_Flushing_Strategy *flushing_strategy (void); + TAO_Flushing_Strategy *flushing_strategy (); /// Get Code Set Manager - TAO_Codeset_Manager *codeset_manager (void); + TAO_Codeset_Manager *codeset_manager (); typedef ACE_Array_Map<ACE_CString, ACE_CString> InitRefMap; /// Return a pointer to the -ORBInitRef map. - InitRefMap * init_ref_map (void); + InitRefMap * init_ref_map (); /// Set the ORB related to the orb_id as the default ORB and not the /// ORB that is first binded in the ORB Table @@ -918,7 +914,7 @@ protected: /// Destructor is protected since the ORB Core is a reference /// counted object. - ~TAO_ORB_Core (void); + ~TAO_ORB_Core (); /// Initialize the guts of the ORB Core. It is intended that this be /// called by CORBA::ORB_init(). @@ -926,7 +922,7 @@ protected: /// Final termination hook, typically called by CORBA::ORB's /// destructor. - int fini (void); + int fini (); /// Routine that creates a ACE_Data_Block given the lock and allocators. ACE_Data_Block *create_data_block_i (size_t size, @@ -935,48 +931,48 @@ protected: ACE_Lock *lock); /// Obtain and cache the typecode factory object reference. - void resolve_typecodefactory_i (void); + void resolve_typecodefactory_i (); /// Obtain and cache the poa current. - void resolve_poa_current_i (void); + void resolve_poa_current_i (); #if TAO_HAS_INTERCEPTORS == 1 /// Obtain and cache the picurrent factory object reference. - void resolve_picurrent_i (void); + void resolve_picurrent_i (); /// Get the Client Request Interceptor adapter. /// If not created, this method will try to create one if needed. - TAO::ClientRequestInterceptor_Adapter *clientrequestinterceptor_adapter_i (void); + TAO::ClientRequestInterceptor_Adapter *clientrequestinterceptor_adapter_i (); /// Get the Server Request Interceptor adapter. /// If not created, this method will try to create one if needed. - TAO::ServerRequestInterceptor_Adapter *serverrequestinterceptor_adapter_i (void); + TAO::ServerRequestInterceptor_Adapter *serverrequestinterceptor_adapter_i (); #endif /* TAO_HAS_INTERCEPTORS */ /// Obtain and cache the codec factory object reference. - void resolve_codecfactory_i (void); + void resolve_codecfactory_i (); /// Obtain and cache the compression manager object reference. - void resolve_compression_manager_i (void); + void resolve_compression_manager_i (); /// Obtain and cache the dynamic any factory object reference. - void resolve_dynanyfactory_i (void); + void resolve_dynanyfactory_i (); /// Obtain and cache the IORManipulation factory object reference. - void resolve_iormanipulation_i (void); + void resolve_iormanipulation_i (); /// Obtain and cache the Monitor object reference. - void resolve_monitor_i (void); + void resolve_monitor_i (); /// Search the Dynamic service list for well known services that has /// callbacks which can be dynamically loaded. - void services_callbacks_init (void); + void services_callbacks_init (); /// Helper method that invokes Interceptor::destroy() on all /// registered interceptors when ORB::destroy() is called. Prevents /// exceptions from propagating up the call chain. - void destroy_interceptors (void); + void destroy_interceptors (); /// Pointer to the list of protocol loaded into this ORB instance. /// Helper method to hold the common code part for -ORBEndpoint and @@ -986,11 +982,11 @@ protected: /// Return pointer to the policy factory registry associated with /// this ORB core. - TAO::PolicyFactory_Registry_Adapter *policy_factory_registry_i (void); + TAO::PolicyFactory_Registry_Adapter *policy_factory_registry_i (); /// Return pointer to the orb initializer registry associated with /// this ORB core. - TAO::ORBInitializer_Registry_Adapter *orbinitializer_registry_i (void); + TAO::ORBInitializer_Registry_Adapter *orbinitializer_registry_i (); /// Common code from ::initialize_object and ::reinitialize_object CORBA::Long initialize_object_i (TAO_Stub *the_stub, @@ -1005,10 +1001,10 @@ private: //@} /// Obtain and cache the ior table object reference. - void resolve_ior_table_i (void); + void resolve_ior_table_i (); /// Obtain and cache the async ior table object reference. - void resolve_async_ior_table_i (void); + void resolve_async_ior_table_i (); /// Checks to see whether collocation optimizations have to be /// applied on objects in the @a other_orb @@ -1211,11 +1207,7 @@ protected: #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ /// Number of outstanding references to this object. -#if defined (ACE_HAS_CPP11) std::atomic<uint32_t> refcount_; -#else - ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; -#endif /* ACE_HAS_CPP11 */ /// Registry containing all registered policy factories. TAO::PolicyFactory_Registry_Adapter *policy_factory_registry_; @@ -1306,7 +1298,7 @@ class TAO_Export TAO_ORB_Core_Static_Resources : public ACE_Service_Object public: /// Return the context-specific singleton instance. - static TAO_ORB_Core_Static_Resources* instance (void); + static TAO_ORB_Core_Static_Resources* instance (); public: /** @@ -1376,7 +1368,7 @@ public: //private: /// Constructor. - TAO_ORB_Core_Static_Resources (void); + TAO_ORB_Core_Static_Resources (); TAO_ORB_Core_Static_Resources& operator= (const TAO_ORB_Core_Static_Resources&); @@ -1392,7 +1384,7 @@ private: /// Obtain an instance of the first ORB core registered in the ORB /// table. -TAO_Export TAO_ORB_Core * TAO_ORB_Core_instance (void); +TAO_Export TAO_ORB_Core * TAO_ORB_Core_instance (); // **************************************************************** diff --git a/TAO/tao/ORB_Core.inl b/TAO/tao/ORB_Core.inl index f68d3beef3d..f6ebac0549d 100644 --- a/TAO/tao/ORB_Core.inl +++ b/TAO/tao/ORB_Core.inl @@ -19,11 +19,7 @@ TAO_ORB_Core::_incr_refcnt (void) ACE_INLINE unsigned long TAO_ORB_Core::_refcnt (void) const { -#if defined (ACE_HAS_CPP11) return this->refcount_; -#else - return this->refcount_.value (); -#endif /* ACE_HAS_CPP11 */ } ACE_INLINE unsigned long diff --git a/TAO/tao/ORB_Core_Auto_Ptr.cpp b/TAO/tao/ORB_Core_Auto_Ptr.cpp index 44b464abf54..e3904b7661e 100644 --- a/TAO/tao/ORB_Core_Auto_Ptr.cpp +++ b/TAO/tao/ORB_Core_Auto_Ptr.cpp @@ -8,9 +8,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_ORB_Core_Auto_Ptr::~TAO_ORB_Core_Auto_Ptr (void) +TAO_ORB_Core_Auto_Ptr::~TAO_ORB_Core_Auto_Ptr () { - if (this->get () != 0) + if (this->get () != nullptr) { this->get ()->_decr_refcnt (); } @@ -19,7 +19,7 @@ TAO_ORB_Core_Auto_Ptr::~TAO_ORB_Core_Auto_Ptr (void) void TAO_ORB_Core_Auto_Ptr::reset (TAO_ORB_Core *p) { - if (this->get () != p && this->get () != 0) + if (this->get () != p && this->get () != nullptr) { this->get ()->_decr_refcnt (); } diff --git a/TAO/tao/ORB_Core_Auto_Ptr.h b/TAO/tao/ORB_Core_Auto_Ptr.h index be8c62fbd8c..0b7a3f6f6a3 100644 --- a/TAO/tao/ORB_Core_Auto_Ptr.h +++ b/TAO/tao/ORB_Core_Auto_Ptr.h @@ -38,7 +38,6 @@ class TAO_ORB_Core; class TAO_Export TAO_ORB_Core_Auto_Ptr { public: - /** * @name Initialization and termination methods */ @@ -46,7 +45,7 @@ public: explicit TAO_ORB_Core_Auto_Ptr (TAO_ORB_Core *p = 0); TAO_ORB_Core_Auto_Ptr (TAO_ORB_Core_Auto_Ptr &ap); TAO_ORB_Core_Auto_Ptr &operator= (TAO_ORB_Core_Auto_Ptr &rhs); - ~TAO_ORB_Core_Auto_Ptr (void); + ~TAO_ORB_Core_Auto_Ptr (); //@} /** @@ -54,8 +53,8 @@ public: */ //@{ TAO_ORB_Core &operator *() const; - TAO_ORB_Core *get (void) const; - TAO_ORB_Core *release (void); + TAO_ORB_Core *get () const; + TAO_ORB_Core *release (); void reset (TAO_ORB_Core *p = 0); TAO_ORB_Core *operator-> () const; //@} diff --git a/TAO/tao/ORB_Core_TSS_Resources.cpp b/TAO/tao/ORB_Core_TSS_Resources.cpp index 7e554596102..f59d131c6d6 100644 --- a/TAO/tao/ORB_Core_TSS_Resources.cpp +++ b/TAO/tao/ORB_Core_TSS_Resources.cpp @@ -3,29 +3,29 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_ORB_Core_TSS_Resources::TAO_ORB_Core_TSS_Resources (void) +TAO_ORB_Core_TSS_Resources::TAO_ORB_Core_TSS_Resources () : event_loop_thread_ (0) , client_leader_thread_ (0) - , lane_ (0) + , lane_ (nullptr) , ts_objects_ () , upcalls_temporarily_suspended_on_this_thread_ (false) - , orb_core_ (0) + , orb_core_ (nullptr) { } -TAO_ORB_Core_TSS_Resources::~TAO_ORB_Core_TSS_Resources (void) +TAO_ORB_Core_TSS_Resources::~TAO_ORB_Core_TSS_Resources () { this->fini (); } void -TAO_ORB_Core_TSS_Resources::fini (void) +TAO_ORB_Core_TSS_Resources::fini () { - if (this->orb_core_ != 0) + if (this->orb_core_ != nullptr) { this->orb_core_->tss_cleanup (this->ts_objects_); } - this->orb_core_ = 0; + this->orb_core_ = nullptr; } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ORB_Core_TSS_Resources.h b/TAO/tao/ORB_Core_TSS_Resources.h index f5c12f9dd32..01e5a60de9c 100644 --- a/TAO/tao/ORB_Core_TSS_Resources.h +++ b/TAO/tao/ORB_Core_TSS_Resources.h @@ -41,13 +41,13 @@ class TAO_Export TAO_ORB_Core_TSS_Resources public: /// Constructor - TAO_ORB_Core_TSS_Resources (void); + TAO_ORB_Core_TSS_Resources (); /// destructor - ~TAO_ORB_Core_TSS_Resources (void); + ~TAO_ORB_Core_TSS_Resources (); /// Cleans TSS resources. - void fini (void); + void fini (); private: diff --git a/TAO/tao/ORB_Table.cpp b/TAO/tao/ORB_Table.cpp index d31aea67b24..174c9272ecf 100644 --- a/TAO/tao/ORB_Table.cpp +++ b/TAO/tao/ORB_Table.cpp @@ -11,11 +11,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO::ORB_Table::ORB_Table (void) +TAO::ORB_Table::ORB_Table () : lock_ (), first_orb_not_default_ (false), table_ (TAO_DEFAULT_ORB_TABLE_SIZE), - first_orb_ (0) + first_orb_ (nullptr) { } @@ -25,7 +25,7 @@ TAO::ORB_Table::bind (char const * orb_id, { // Make sure that the supplied ORB core pointer is valid, // i.e. non-zero. - if (orb_id == 0 || orb_core == 0) + if (orb_id == nullptr || orb_core == nullptr) { errno = EINVAL; return -1; @@ -46,7 +46,7 @@ TAO::ORB_Table::bind (char const * orb_id, // This is not the first ORB, but if the current default ORB // decided not to be the default and there is more than one ORB // then set this ORB to be the default. - if (this->first_orb_ != 0 + if (this->first_orb_ != nullptr && this->first_orb_not_default_) { this->first_orb_ = orb_core; @@ -55,7 +55,7 @@ TAO::ORB_Table::bind (char const * orb_id, // Set the "first_orb_" member for the first given ORB Core // that was successfully added to the ORB table. - if (this->first_orb_ == 0) + if (this->first_orb_ == nullptr) { this->first_orb_ = orb_core; } @@ -67,12 +67,12 @@ TAO::ORB_Table::bind (char const * orb_id, TAO_ORB_Core * TAO::ORB_Table::find (char const * orb_id) { - TAO_ORB_Core * orb_core = 0; + TAO_ORB_Core * orb_core = nullptr; ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, - 0); + nullptr); iterator const i = this->table_.find (Table::key_type (orb_id)); @@ -110,7 +110,7 @@ TAO::ORB_Table::unbind (const char *orb_id) } else { - this->first_orb_ = 0; + this->first_orb_ = nullptr; } } } @@ -145,7 +145,7 @@ TAO::ORB_Table::not_default (char const * orb_id) // Check if there is a default ORB already and if it is *not* the // same as the orb_id thats passed in. We don't have to do // anything. - if (this->first_orb_ != 0) + if (this->first_orb_ != nullptr) { if (ACE_OS::strcmp (this->first_orb_->orbid (), orb_id) != 0) { @@ -162,7 +162,7 @@ TAO::ORB_Table::not_default (char const * orb_id) } TAO::ORB_Table * -TAO::ORB_Table::instance (void) +TAO::ORB_Table::instance () { return TAO_Singleton<TAO::ORB_Table, TAO_SYNCH_MUTEX>::instance (); } diff --git a/TAO/tao/ORB_Table.h b/TAO/tao/ORB_Table.h index c1e5ed0d60e..8841c8d34a3 100644 --- a/TAO/tao/ORB_Table.h +++ b/TAO/tao/ORB_Table.h @@ -67,7 +67,7 @@ namespace TAO * @note See the note in the class description for an explanation * of why this constructor is not protected. */ - ORB_Table (void); + ORB_Table (); typedef ACE_Array_Map<CORBA::String_var, ORB_Core_Ref_Counter, @@ -82,8 +82,8 @@ namespace TAO * @name The canonical ACE_Map methods. */ //@{ - iterator begin (void); - iterator end (void); + iterator begin (); + iterator end (); int bind (const char *orb_id, ::TAO_ORB_Core *orb_core); /// Return @c TAO_ORB_Core corresponding to ORB with given @a @@ -99,10 +99,10 @@ namespace TAO /// Obtain the first ORB for the @c ORB_Core_instance() /// implementation. - ::TAO_ORB_Core * first_orb (void); + ::TAO_ORB_Core * first_orb (); /// Return a unique instance - static ORB_Table * instance (void); + static ORB_Table * instance (); /// Set the ORB related to the orb_id as the default ORB and not the /// ORB that is first binded. @@ -113,10 +113,10 @@ namespace TAO void not_default (char const * orb_id); /// Accessor to the underlying table_ - Table * table (void); + Table * table (); /// Return reference to underlying lock. - TAO_SYNCH_MUTEX & lock (void); + TAO_SYNCH_MUTEX & lock (); private: @@ -158,13 +158,13 @@ namespace TAO public: /// Constructor. - ORB_Core_Ref_Counter (void); + ORB_Core_Ref_Counter (); /// Constructor. ORB_Core_Ref_Counter (::TAO_ORB_Core * core); /// Destructor. - ~ORB_Core_Ref_Counter (void); + ~ORB_Core_Ref_Counter (); /// Copy constructor. ORB_Core_Ref_Counter (ORB_Core_Ref_Counter const & rhs); @@ -173,7 +173,7 @@ namespace TAO void operator= (ORB_Core_Ref_Counter const & rhs); /// ORB_Core pointer accessor. - ::TAO_ORB_Core * core (void) const { return this->core_; } + ::TAO_ORB_Core * core () const { return this->core_; } private: ::TAO_ORB_Core * core_; diff --git a/TAO/tao/ORB_Time_Policy.cpp b/TAO/tao/ORB_Time_Policy.cpp index a8c9fe9672a..242197c6362 100644 --- a/TAO/tao/ORB_Time_Policy.cpp +++ b/TAO/tao/ORB_Time_Policy.cpp @@ -13,13 +13,13 @@ namespace TAO void ORB_Time_Policy::set_time_policy (ACE_Dynamic_Time_Policy_Base const * pol) { - if (pol != 0 ) + if (pol != nullptr ) { active_policy_ = pol; } } - void ORB_Time_Policy::reset_time_policy (void) + void ORB_Time_Policy::reset_time_policy () { active_policy_ = &default_policy_; } diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index b96ae7b5125..f1be9002e7d 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -30,7 +30,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -CORBA::Object::~Object (void) +CORBA::Object::~Object () { if (this->protocol_proxy_) (void) this->protocol_proxy_->_decr_refcnt (); @@ -43,16 +43,16 @@ CORBA::Object::Object (TAO_Stub * protocol_proxy, : refcount_ (1) , is_local_ (false) , is_evaluated_ (true) - , ior_ (0) + , ior_ (nullptr) , orb_core_ (orb_core) , protocol_proxy_ (protocol_proxy) { /// This constructor should not be called when the protocol proxy is /// null ie. when the object is a LocalObject. Assert that /// requirement. - ACE_ASSERT (this->protocol_proxy_ != 0); + ACE_ASSERT (this->protocol_proxy_ != nullptr); - if (this->orb_core_ == 0) + if (this->orb_core_ == nullptr) this->orb_core_ = this->protocol_proxy_->orb_core (); // Set the collocation marker on the stub. This may not be news to it. @@ -70,7 +70,7 @@ CORBA::Object::Object (IOP::IOR *ior, , is_evaluated_ (false) , ior_ (ior) , orb_core_ (orb_core) - , protocol_proxy_ (0) + , protocol_proxy_ (nullptr) { } @@ -93,13 +93,13 @@ if (!this->is_evaluated_) \ } void -CORBA::Object::_add_ref (void) +CORBA::Object::_add_ref () { ++this->refcount_; } void -CORBA::Object::_remove_ref (void) +CORBA::Object::_remove_ref () { if (--this->refcount_ == 0) { @@ -108,13 +108,9 @@ CORBA::Object::_remove_ref (void) } CORBA::ULong -CORBA::Object::_refcount_value(void) const +CORBA::Object::_refcount_value() const { -#if defined (ACE_HAS_CPP11) return this->refcount_; -#else - return this->refcount_.value (); -#endif /* ACE_HAS_CPP11 */ } void @@ -134,7 +130,7 @@ CORBA::Object::marshal (TAO_OutputCDR &cdr) /*static*/ CORBA::Boolean CORBA::Object::marshal (const CORBA::Object_ptr x, TAO_OutputCDR &cdr) { - if (x == 0) + if (x == nullptr) { // NIL objrefs ... marshal as empty type hint, no elements. cdr.write_ulong (1); @@ -164,7 +160,7 @@ CORBA::Object::_tao_stream_v (std::ostream &strm) const #endif /* GEN_OSTREAM_OPS */ bool -CORBA::Object::can_convert_to_ior (void) const +CORBA::Object::can_convert_to_ior () const { // By default, objects can not be stringified if they are local return !this->_is_local (); @@ -173,16 +169,16 @@ CORBA::Object::can_convert_to_ior (void) const char* CORBA::Object::convert_to_ior (bool, const char*) const { - return 0; + return nullptr; } TAO_Abstract_ServantBase* -CORBA::Object::_servant (void) const +CORBA::Object::_servant () const { - if (this->protocol_proxy_ == 0) + if (this->protocol_proxy_ == nullptr) { // No stub set. Should not happen. - return 0; + return nullptr; } return this->protocol_proxy_->collocated_servant (); @@ -212,7 +208,7 @@ CORBA::Object::_is_a (const char *type_id) // // XXX if type_id is that of CORBA::Object, "yes, we comply" :-) - if (this->protocol_proxy_ == 0) + if (this->protocol_proxy_ == nullptr) { if (TAO_debug_level > 0) TAOLIB_ERROR ((LM_ERROR, @@ -222,7 +218,7 @@ CORBA::Object::_is_a (const char *type_id) throw ::CORBA::NO_IMPLEMENT (); } - if (this->_stubobj ()->type_id.in () != 0 + if (this->_stubobj ()->type_id.in () != nullptr && ACE_OS::strcmp (type_id, this->_stubobj ()->type_id.in ()) == 0) return true; @@ -231,13 +227,13 @@ CORBA::Object::_is_a (const char *type_id) } const char* -CORBA::Object::_interface_repository_id (void) const +CORBA::Object::_interface_repository_id () const { return "IDL:omg.org/CORBA/Object:1.0"; } CORBA::Boolean -CORBA::Object::_is_collocated (void) const +CORBA::Object::_is_collocated () const { if (this->protocol_proxy_) { @@ -248,19 +244,19 @@ CORBA::Object::_is_collocated (void) const } CORBA::Boolean -CORBA::Object::_is_local (void) const +CORBA::Object::_is_local () const { return this->is_local_; } TAO_Stub * -CORBA::Object::_stubobj (void) const +CORBA::Object::_stubobj () const { return this->protocol_proxy_; } TAO_Stub * -CORBA::Object::_stubobj (void) +CORBA::Object::_stubobj () { TAO_OBJECT_IOR_EVALUATE_RETURN; return this->protocol_proxy_; @@ -271,7 +267,7 @@ CORBA::Object::_hash (CORBA::ULong maximum) { TAO_OBJECT_IOR_EVALUATE_RETURN; - if (this->protocol_proxy_ != 0) + if (this->protocol_proxy_ != nullptr) return this->protocol_proxy_->hash (maximum); else { @@ -291,7 +287,7 @@ CORBA::Object::_hash (CORBA::ULong maximum) CORBA::Boolean CORBA::Object::_is_equivalent (CORBA::Object_ptr other_obj) { - if (other_obj == 0) + if (other_obj == nullptr) { return false; } @@ -303,7 +299,7 @@ CORBA::Object::_is_equivalent (CORBA::Object_ptr other_obj) TAO_OBJECT_IOR_EVALUATE_RETURN; - if (this->protocol_proxy_ != 0) + if (this->protocol_proxy_ != nullptr) return this->protocol_proxy_->is_equivalent (other_obj); return false; @@ -312,7 +308,7 @@ CORBA::Object::_is_equivalent (CORBA::Object_ptr other_obj) // TAO's extensions TAO::ObjectKey * -CORBA::Object::_key (void) +CORBA::Object::_key () { TAO_OBJECT_IOR_EVALUATE_RETURN; @@ -342,13 +338,12 @@ CORBA::Object::_proxy_broker (TAO::Object_Proxy_Broker *proxy_broker) CORBA::Boolean CORBA::Object::is_nil_i (CORBA::Object_ptr obj) { - - // If the profile length is zero for a non-evaluted IOR it is a + // If the profile length is zero for a non-evaluated IOR it is a // null-object. if ((!obj->is_evaluated ()) && obj->ior ().profiles.length () == 0) return true; - // To accomodate new definitions. + // To accommodate new definitions. if (obj->orb_core_) { return obj->orb_core_->object_is_nil (obj); @@ -357,8 +352,6 @@ CORBA::Object::is_nil_i (CORBA::Object_ptr obj) return false; } - - #if (TAO_HAS_MINIMUM_CORBA == 0) #if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) @@ -376,7 +369,7 @@ CORBA::Object::_create_request (CORBA::Context_ptr ctx, // is a no-no. // Neither can we create a request object from locality constrained // object references. - if (ctx != 0 || this->protocol_proxy_ == 0) + if (ctx != nullptr || this->protocol_proxy_ == nullptr) { if (TAO_debug_level > 0) TAOLIB_ERROR ((LM_ERROR, @@ -397,10 +390,9 @@ CORBA::Object::_create_request (CORBA::Context_ptr ctx, operation, arg_list, result, - 0, + nullptr, request, - req_flags - ); + req_flags); } #endif @@ -421,7 +413,7 @@ CORBA::Object::_create_request (CORBA::Context_ptr ctx, // is a no-no. // Neither can we create a request object from locality constrained // object references. - if (ctx != 0 || this->protocol_proxy_ == 0) + if (ctx != nullptr || this->protocol_proxy_ == nullptr) { if (TAO_debug_level > 0) TAOLIB_ERROR ((LM_ERROR, @@ -481,7 +473,7 @@ CORBA::Object::_request (const char *operation) // the latter case, return true. CORBA::Boolean -CORBA::Object::_non_existent (void) +CORBA::Object::_non_existent () { TAO_OBJECT_IOR_EVALUATE_RETURN; @@ -502,14 +494,14 @@ CORBA::Object::_non_existent (void) #if ! defined (CORBA_E_COMPACT) && ! defined (CORBA_E_MICRO) CORBA::InterfaceDef_ptr -CORBA::Object::_get_interface (void) +CORBA::Object::_get_interface () { TAO_OBJECT_IOR_EVALUATE_RETURN; return this->proxy_broker ()->_get_interface (this); } CORBA::Object_ptr -CORBA::Object::_get_component (void) +CORBA::Object::_get_component () { TAO_OBJECT_IOR_EVALUATE_RETURN; return this->proxy_broker ()->_get_component (this); @@ -517,7 +509,7 @@ CORBA::Object::_get_component (void) #endif char* -CORBA::Object::_repository_id (void) +CORBA::Object::_repository_id () { TAO_OBJECT_IOR_EVALUATE_RETURN; return this->proxy_broker ()->_repository_id (this); @@ -601,7 +593,7 @@ CORBA::Object::_set_policy_overrides ( // If the stub is collocated and we don't have a collocated server we need // to reinitialize it to get it. - if (stub->is_collocated () && stub->collocated_servant () == 0) + if (stub->is_collocated () && stub->collocated_servant () == nullptr) { obj->orb_core ()->reinitialize_object (stub); } @@ -633,7 +625,7 @@ CORBA::Object::_validate_connection ( { TAO_OBJECT_IOR_EVALUATE_RETURN; - inconsistent_policies = 0; + inconsistent_policies = nullptr; CORBA::Boolean retval = true; #if (TAO_HAS_MINIMUM_CORBA == 0) @@ -665,9 +657,9 @@ CORBA::Object::_validate_connection ( CORBA::ORB_ptr -CORBA::Object::_get_orb (void) +CORBA::Object::_get_orb () { - if (this->orb_core_ != 0) + if (this->orb_core_ != nullptr) { return CORBA::ORB::_duplicate (this->orb_core_->orb ()); } @@ -688,12 +680,11 @@ CORBA::Object::_get_orb (void) } TAO::Object_Proxy_Broker * -CORBA::Object::proxy_broker (void) const +CORBA::Object::proxy_broker () const { // Paranoid check. We *should* never access the proxy_broker // when the object has not been initialised so there *should* - // alway be a stub, but just in case... - + // always be a stub, but just in case... if (this->protocol_proxy_) { return this->protocol_proxy_->object_proxy_broker (); @@ -710,7 +701,7 @@ CORBA::Object::proxy_broker (void) const CORBA::Boolean operator<< (TAO_OutputCDR& cdr, const CORBA::Object* x) { - if (x == 0) + if (x == nullptr) { // NIL objrefs ... marshal as empty type hint, no elements. cdr.write_ulong (1); @@ -729,7 +720,7 @@ operator<< (TAO_OutputCDR& cdr, const CORBA::Object* x) TAO_Stub *stubobj = x->_stubobj (); - if (stubobj == 0) + if (stubobj == nullptr) return false; return (stubobj->marshal (cdr)); @@ -751,7 +742,7 @@ CORBA::Object::tao_object_initialize (CORBA::Object *obj) TAO_MProfile mp (profile_count); TAO_ORB_Core *&orb_core = obj->orb_core_; - if (orb_core == 0) + if (orb_core == nullptr) { orb_core = TAO_ORB_Core_instance (); if (TAO_debug_level > 0) @@ -763,7 +754,7 @@ CORBA::Object::tao_object_initialize (CORBA::Object *obj) } } - TAO_Stub *objdata = 0; + TAO_Stub *objdata = nullptr; try { @@ -789,7 +780,7 @@ CORBA::Object::tao_object_initialize (CORBA::Object *obj) TAO_Profile *pfile = connector_registry->create_profile (cdr); - if (pfile != 0) + if (pfile != nullptr) { if (mp.give_profile (pfile) == -1) { @@ -837,7 +828,7 @@ CORBA::Object::tao_object_initialize (CORBA::Object *obj) obj->is_evaluated_ = true; // Release the contents of the ior to keep memory consumption down. - obj->ior_ = 0; + obj->ior_ = nullptr; // Transfer ownership to the CORBA::Object (void) safe_objdata.release (); @@ -849,7 +840,7 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x) bool lazy_strategy = false; TAO_ORB_Core *orb_core = cdr.orb_core (); - if (orb_core == 0) + if (orb_core == nullptr) { orb_core = TAO_ORB_Core_instance (); if (TAO_debug_level > 0) @@ -872,7 +863,6 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x) { // If the user has set up a eager strategy.. CORBA::String_var type_hint; - if (!(cdr >> type_hint.inout ())) return false; @@ -890,7 +880,7 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x) TAO_MProfile mp (profile_count); TAO_ORB_Core *orb_core = cdr.orb_core (); - if (orb_core == 0) + if (orb_core == nullptr) { orb_core = TAO_ORB_Core_instance (); if (TAO_debug_level > 0) @@ -904,8 +894,7 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x) // Ownership of type_hint is given to TAO_Stub // TAO_Stub will make a copy of mp! - - TAO_Stub *objdata = 0; + TAO_Stub *objdata = nullptr; try { @@ -915,7 +904,7 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x) for (CORBA::ULong i = 0; i != profile_count && cdr.good_bit (); ++i) { TAO_Profile *pfile = connector_registry->create_profile (cdr); - if (pfile != 0) + if (pfile != nullptr) { if (mp.give_profile (pfile) == -1) { @@ -966,7 +955,7 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x) else { // Lazy strategy! - IOP::IOR *ior = 0; + IOP::IOR *ior = nullptr; ACE_NEW_RETURN (ior, IOP::IOR (), @@ -983,7 +972,7 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x) ACE_NEW_NORETURN (x, CORBA::Object (ior, orb_core)); - if (x == 0) + if (x == nullptr) { // Can't allocate a CORBA Object so delete first the // memory we already allocated before we return @@ -1009,7 +998,6 @@ operator<< (std::ostream &strm, CORBA::Object_ptr _tao_objref) // Traits specializations for CORBA::Object. namespace TAO { - void In_Object_Argument_Cloner_T<CORBA::InterfaceDef_ptr>::duplicate (CORBA::InterfaceDef_ptr) { @@ -1033,7 +1021,7 @@ namespace TAO } CORBA::Object_ptr - Objref_Traits<CORBA::Object>::nil (void) + Objref_Traits<CORBA::Object>::nil () { return CORBA::Object::_nil (); } @@ -1046,8 +1034,6 @@ namespace TAO } } // close TAO namespace - -TAO::Object_Proxy_Broker * (*_TAO_Object_Proxy_Broker_Factory_function_pointer) (void) = 0; - +TAO::Object_Proxy_Broker * (*_TAO_Object_Proxy_Broker_Factory_function_pointer) () = nullptr; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h index a2d2dd26fae..c7f9752374f 100644 --- a/TAO/tao/Object.h +++ b/TAO/tao/Object.h @@ -30,11 +30,7 @@ #include "tao/Object_Argument_T.h" #include "tao/Arg_Traits_T.h" #include "tao/Any_Insert_Policy_T.h" -#if defined (ACE_HAS_CPP11) -# include <atomic> -#else -# include "ace/Atomic_Op.h" -#endif /* ACE_HAS_CPP11 */ +#include <atomic> #if defined (HPUX) && defined (IOR) /* HP-UX 11.11 defines IOR in /usr/include/pa/inline.h @@ -101,9 +97,8 @@ namespace CORBA class TAO_Export Object { public: - /// Destructor. - virtual ~Object (void); + virtual ~Object (); /** * @name Spec defined methods @@ -116,7 +111,7 @@ namespace CORBA static CORBA::Object_ptr _duplicate (CORBA::Object_ptr obj); /// Return a NULL object. - static CORBA::Object_ptr _nil (void); + static CORBA::Object_ptr _nil (); /// No-op it is just here to simplify some templates. static CORBA::Object_ptr _narrow (CORBA::Object_ptr obj); @@ -132,7 +127,7 @@ namespace CORBA /// The repository ID for the most derived class, this is an /// implementation method and does no remote invocations! - virtual const char* _interface_repository_id (void) const; + virtual const char* _interface_repository_id () const; /** * Return a (potentially non-unique) hash value for this object. @@ -153,18 +148,18 @@ namespace CORBA #if (TAO_HAS_MINIMUM_CORBA == 0) - virtual CORBA::Boolean _non_existent (void); + virtual CORBA::Boolean _non_existent (); #if ! defined (CORBA_E_COMPACT) && ! defined (CORBA_E_MICRO) /// Get info about the object from the Interface Repository. - virtual InterfaceDef_ptr _get_interface (void); + virtual InterfaceDef_ptr _get_interface (); /// Get info about the object from the Interface Repository. - virtual CORBA::Object_ptr _get_component (void); + virtual CORBA::Object_ptr _get_component (); #endif /// Get the repository id. - virtual char * _repository_id (void); + virtual char * _repository_id (); #if ! defined (CORBA_E_COMPACT) && ! defined (CORBA_E_MICRO) // DII operations to create a request. @@ -218,7 +213,7 @@ namespace CORBA #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ - virtual CORBA::ORB_ptr _get_orb (void); + virtual CORBA::ORB_ptr _get_orb (); /** * @name Reference Count Management @@ -228,13 +223,13 @@ namespace CORBA */ //@{ /// Increment the reference count. - virtual void _add_ref (void); + virtual void _add_ref (); /// Decrement the reference count. - virtual void _remove_ref (void); + virtual void _remove_ref (); /// Get the refcount - virtual CORBA::ULong _refcount_value (void) const; + virtual CORBA::ULong _refcount_value () const; //@} // Useful for template programming. @@ -252,15 +247,15 @@ namespace CORBA /// Accessor for the cached servant reference held on the stub /// if this object is collocated - virtual TAO_Abstract_ServantBase *_servant (void) const; + virtual TAO_Abstract_ServantBase *_servant () const; /// Is this object collocated with the servant? /// Note this does not return this->is_collocated_ but will instead /// query the underlying stub for its collocation status - virtual CORBA::Boolean _is_collocated (void) const; + virtual CORBA::Boolean _is_collocated () const; /// Is this a local object? - virtual CORBA::Boolean _is_local (void) const; + virtual CORBA::Boolean _is_local () const; /// Used in the implementation of CORBA::Any static void _tao_any_destructor (void*); @@ -273,7 +268,7 @@ namespace CORBA /// Return the object key as an out parameter. Caller should release /// return value when finished with it. - virtual TAO::ObjectKey *_key (void); + virtual TAO::ObjectKey *_key (); /// Constructor Object (TAO_Stub *p, @@ -284,14 +279,13 @@ namespace CORBA Object (IOP::IOR *ior, TAO_ORB_Core *orb_core); /// Get the underlying stub object. - virtual TAO_Stub *_stubobj (void) const; - virtual TAO_Stub *_stubobj (void); + virtual TAO_Stub *_stubobj () const; + virtual TAO_Stub *_stubobj (); /// Set the proxy broker. virtual void _proxy_broker (TAO::Object_Proxy_Broker *proxy_broker); public: - /// Allows us to forbid marshaling of local interfaces. virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -306,10 +300,10 @@ namespace CORBA #endif /* GEN_OSTREAM_OPS */ /// Accessor to the flag.. - CORBA::Boolean is_evaluated (void) const; + CORBA::Boolean is_evaluated () const; /// Accessor for the ORB_Core.. - TAO_ORB_Core *orb_core (void) const; + TAO_ORB_Core *orb_core () const; /// Accessors for the underlying IOP::IOR's. /** @@ -317,14 +311,14 @@ namespace CORBA * the IOR. This is useful for cases when one wants to initialize * a new CORBA Object */ - IOP::IOR *steal_ior (void); + IOP::IOR *steal_ior (); - const IOP::IOR &ior (void) const; + const IOP::IOR &ior () const; //@} End of TAO-specific methods.. /// Can this object be stringified? - virtual bool can_convert_to_ior (void) const; + virtual bool can_convert_to_ior () const; /// A hook to allow users to provide custom object stringification. /// @note This method is intended to be used by classes that @@ -333,7 +327,7 @@ namespace CORBA const char* ior_prefix) const; /// Wrapper for _remove_ref(), naming convention for templatizing. - void _decr_refcount (void); + void _decr_refcount (); protected: /// Initializing a local object. @@ -344,15 +338,10 @@ namespace CORBA TAO::Object_Proxy_Broker *proxy_broker () const; /// Number of outstanding references to this object. -#if defined (ACE_HAS_CPP11) # define TAO_OBJECT_USES_STD_ATOMIC_REFCOUNT std::atomic<uint32_t> refcount_; -#else - ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; -#endif /* ACE_HAS_CPP11 */ private: - // = Unimplemented methods ACE_UNIMPLEMENTED_FUNC (Object (const Object &)) ACE_UNIMPLEMENTED_FUNC (Object &operator = (const Object &)) @@ -419,7 +408,7 @@ namespace TAO { static CORBA::Object_ptr duplicate (CORBA::Object_ptr); static void release (CORBA::Object_ptr); - static CORBA::Object_ptr nil (void); + static CORBA::Object_ptr nil (); static CORBA::Boolean marshal (const CORBA::Object_ptr p, TAO_OutputCDR & cdr); }; @@ -436,7 +425,7 @@ namespace TAO /// library is present. extern TAO_Export TAO::Object_Proxy_Broker * - (*_TAO_Object_Proxy_Broker_Factory_function_pointer) (void); + (*_TAO_Object_Proxy_Broker_Factory_function_pointer) (); TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR&, const CORBA::Object*); diff --git a/TAO/tao/ObjectKey_Table.cpp b/TAO/tao/ObjectKey_Table.cpp index 328df7abc63..b6c5474b37f 100644 --- a/TAO/tao/ObjectKey_Table.cpp +++ b/TAO/tao/ObjectKey_Table.cpp @@ -31,19 +31,19 @@ TAO::Less_Than_ObjectKey::operator () (const TAO::ObjectKey &lhs, } /********************************************************/ -TAO::ObjectKey_Table::ObjectKey_Table (void) +TAO::ObjectKey_Table::ObjectKey_Table () : table_ () { } -TAO::ObjectKey_Table::~ObjectKey_Table (void) +TAO::ObjectKey_Table::~ObjectKey_Table () { this->table_.close (); } int -TAO::ObjectKey_Table::destroy (void) +TAO::ObjectKey_Table::destroy () { if (this->table_.current_size ()) { @@ -92,7 +92,7 @@ TAO::ObjectKey_Table::bind_i (const TAO::ObjectKey &key, int TAO::ObjectKey_Table::unbind_i (TAO::Refcounted_ObjectKey *&key_new) { - TAO::Refcounted_ObjectKey *tmp = 0; + TAO::Refcounted_ObjectKey *tmp = nullptr; if (this->table_.unbind (key_new->object_key (), tmp) != -1) { diff --git a/TAO/tao/ObjectKey_Table.h b/TAO/tao/ObjectKey_Table.h index d467e6d2711..55fa8ddcc0c 100644 --- a/TAO/tao/ObjectKey_Table.h +++ b/TAO/tao/ObjectKey_Table.h @@ -87,12 +87,12 @@ namespace TAO { public: /// Default Constructor and destructor.. - ObjectKey_Table (void); + ObjectKey_Table (); - ~ObjectKey_Table (void); + ~ObjectKey_Table (); /// Iterates and unbinds the contents of the table. - int destroy (void); + int destroy (); /// Bind the ObjectKey in the table. /** diff --git a/TAO/tao/Object_Argument_T.h b/TAO/tao/Object_Argument_T.h index 5befb04c321..a2e2937c869 100644 --- a/TAO/tao/Object_Argument_T.h +++ b/TAO/tao/Object_Argument_T.h @@ -41,7 +41,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S_ptr arg (void) const; + S_ptr arg () const; protected: S_ptr x_; @@ -67,9 +67,9 @@ namespace TAO { public: In_Object_Clonable_Argument_T (S_ptr x); - virtual ~In_Object_Clonable_Argument_T (void); + virtual ~In_Object_Clonable_Argument_T (); - virtual Argument* clone (void); + virtual Argument* clone (); private: bool is_clone_; @@ -94,7 +94,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S_ptr & arg (void); + S_ptr & arg (); private: S_ptr & x_; @@ -118,7 +118,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S_out arg (void); + S_out arg (); private: S_ptr & x_; @@ -137,16 +137,16 @@ namespace TAO { public: - Ret_Object_Argument_T (void); + Ret_Object_Argument_T (); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S_ptr & arg (void); + S_ptr & arg (); - S_ptr excp (void); - S_ptr retn (void); + S_ptr excp (); + S_ptr retn (); private: S_var x_; diff --git a/TAO/tao/Object_KeyC.cpp b/TAO/tao/Object_KeyC.cpp index 6f128153b13..dc0c4745f8d 100644 --- a/TAO/tao/Object_KeyC.cpp +++ b/TAO/tao/Object_KeyC.cpp @@ -52,7 +52,7 @@ namespace TAO #if !defined (_TAO_OBJECTKEY_CS_) #define _TAO_OBJECTKEY_CS_ -TAO::ObjectKey::ObjectKey (void) +TAO::ObjectKey::ObjectKey () {} TAO::ObjectKey::ObjectKey ( @@ -76,7 +76,7 @@ TAO::ObjectKey::ObjectKey ( (max, length, buffer, release) {} -TAO::ObjectKey::~ObjectKey (void) +TAO::ObjectKey::~ObjectKey () {} // Hand crafted. @@ -143,7 +143,7 @@ TAO::ObjectKey::decode_string_to_sequence ( TAO::unbounded_value_sequence<CORBA::Octet> & seq, char const * str) { - if (str == 0) + if (str == nullptr) { seq.length (0); return; diff --git a/TAO/tao/Object_KeyC.h b/TAO/tao/Object_KeyC.h index 9854f40b8d0..3ad8a251c09 100644 --- a/TAO/tao/Object_KeyC.h +++ b/TAO/tao/Object_KeyC.h @@ -84,7 +84,7 @@ namespace TAO > { public: - ObjectKey (void); + ObjectKey (); ObjectKey (CORBA::ULong max); ObjectKey ( CORBA::ULong max, @@ -92,13 +92,11 @@ namespace TAO CORBA::Octet* buffer, CORBA::Boolean release = false ); -#if defined (ACE_HAS_CPP11) ObjectKey (const ObjectKey &) = default; ObjectKey (ObjectKey &&) = default; ObjectKey& operator= (const ObjectKey &) = default; ObjectKey& operator= (ObjectKey &&) = default; -#endif /* ACE_HAS_CPP11 */ - ~ObjectKey (void); + ~ObjectKey (); typedef ObjectKey_var _var_type; diff --git a/TAO/tao/Object_Loader.cpp b/TAO/tao/Object_Loader.cpp index 3dc0eb22099..4a1b32c30b6 100644 --- a/TAO/tao/Object_Loader.cpp +++ b/TAO/tao/Object_Loader.cpp @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Object_Loader::~TAO_Object_Loader (void) +TAO_Object_Loader::~TAO_Object_Loader () { } diff --git a/TAO/tao/Object_Loader.h b/TAO/tao/Object_Loader.h index a40fe96d375..cbed00313fb 100644 --- a/TAO/tao/Object_Loader.h +++ b/TAO/tao/Object_Loader.h @@ -48,7 +48,7 @@ class TAO_Export TAO_Object_Loader : public ACE_Service_Object { public: /// The destructor - virtual ~TAO_Object_Loader (void); + virtual ~TAO_Object_Loader (); /** * Create and activate a new object into the orb. diff --git a/TAO/tao/Object_Proxy_Broker.cpp b/TAO/tao/Object_Proxy_Broker.cpp index f5f4c45eff0..0870e737deb 100644 --- a/TAO/tao/Object_Proxy_Broker.cpp +++ b/TAO/tao/Object_Proxy_Broker.cpp @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO::Object_Proxy_Broker::~Object_Proxy_Broker (void) +TAO::Object_Proxy_Broker::~Object_Proxy_Broker () { } diff --git a/TAO/tao/Object_Proxy_Broker.h b/TAO/tao/Object_Proxy_Broker.h index 4eaac3cbf0e..27fc4c656d2 100644 --- a/TAO/tao/Object_Proxy_Broker.h +++ b/TAO/tao/Object_Proxy_Broker.h @@ -49,9 +49,8 @@ namespace TAO class TAO_Export Object_Proxy_Broker { public: - /// Destructor - virtual ~Object_Proxy_Broker (void); + virtual ~Object_Proxy_Broker (); virtual CORBA::Boolean _is_a (CORBA::Object_ptr target, const char *logical_type_id) = 0; diff --git a/TAO/tao/Object_Ref_Table.cpp b/TAO/tao/Object_Ref_Table.cpp index 3b2bf7360bc..e5268b7612e 100644 --- a/TAO/tao/Object_Ref_Table.cpp +++ b/TAO/tao/Object_Ref_Table.cpp @@ -64,7 +64,7 @@ TAO_Object_Ref_Table::bind_i (const char *id, CORBA::Object_ptr obj) { // Make sure that the supplied Object reference is valid, // i.e. not nil. - if (id == 0 + if (id == nullptr || ACE_OS::strlen (id) == 0 || ::CORBA::is_nil (obj)) { diff --git a/TAO/tao/Object_Ref_Table.h b/TAO/tao/Object_Ref_Table.h index 1eb79612fea..fb7ca8039ae 100644 --- a/TAO/tao/Object_Ref_Table.h +++ b/TAO/tao/Object_Ref_Table.h @@ -49,7 +49,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Export TAO_Object_Ref_Table { public: - typedef ACE_Array_Map<CORBA::String_var, CORBA::Object_var, TAO::String_Var_Equal_To> Table; @@ -57,7 +56,7 @@ public: typedef Table::iterator iterator; /// Constructor - TAO_Object_Ref_Table (void); + TAO_Object_Ref_Table (); /** * Register an object reference with the table, and map the given @@ -79,21 +78,20 @@ public: CORBA::Object_ptr resolve_initial_reference (const char * id); /// Explicitly destroy the contents of the object reference table. - void destroy (void); + void destroy (); /** * @name Forward Iterators */ //@{ - iterator begin (void); - iterator end (void); + iterator begin (); + iterator end (); //@} /// Return the current size of the underlying table. - size_t current_size (void) const; + size_t current_size () const; private: - /** * @name The canonical ACE_Map methods */ @@ -104,19 +102,17 @@ private: //@} private: - - // Disallow copying and assignment. - TAO_Object_Ref_Table (const TAO_Object_Ref_Table &); - void operator= (const TAO_Object_Ref_Table &); + TAO_Object_Ref_Table (const TAO_Object_Ref_Table &) = delete; + void operator= (const TAO_Object_Ref_Table &) = delete; + TAO_Object_Ref_Table (TAO_Object_Ref_Table &&) = delete; + void operator= (TAO_Object_Ref_Table &&) = delete; private: - /// The implementation. Table table_; /// Table synchronization lock. TAO_SYNCH_MUTEX lock_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Object_Reference_Const_Sequence_Element_T.h b/TAO/tao/Object_Reference_Const_Sequence_Element_T.h index 9f32df30fed..31f3aa3226e 100644 --- a/TAO/tao/Object_Reference_Const_Sequence_Element_T.h +++ b/TAO/tao/Object_Reference_Const_Sequence_Element_T.h @@ -45,12 +45,12 @@ public: { } - inline operator object_reference_type * (void) const + inline operator object_reference_type * () const { return *this->element_; } - inline object_reference_type * in (void) const + inline object_reference_type * in () const { return *this->element_; } diff --git a/TAO/tao/Object_Reference_Sequence_Element_T.h b/TAO/tao/Object_Reference_Sequence_Element_T.h index c1d04e108fb..08e283e91e7 100644 --- a/TAO/tao/Object_Reference_Sequence_Element_T.h +++ b/TAO/tao/Object_Reference_Sequence_Element_T.h @@ -89,11 +89,11 @@ public: return *this->element_; } - inline object_reference_type *in (void) const { + inline object_reference_type *in () const { return *this->element_; } - inline object_reference_type *&inout (void) const { + inline object_reference_type *&inout () const { return *this->element_; } diff --git a/TAO/tao/Objref_VarOut_T.h b/TAO/tao/Objref_VarOut_T.h index 95c88afbe54..3d31c1cc941 100644 --- a/TAO/tao/Objref_VarOut_T.h +++ b/TAO/tao/Objref_VarOut_T.h @@ -47,14 +47,14 @@ template <typename T> class TAO_Objref_Var_T : private TAO_Base_var { public: - TAO_Objref_Var_T (void); + TAO_Objref_Var_T (); TAO_Objref_Var_T (T * p) : ptr_ (p) {} TAO_Objref_Var_T (const TAO_Objref_Var_T<T> &); - ~TAO_Objref_Var_T (void); + ~TAO_Objref_Var_T (); TAO_Objref_Var_T<T> & operator= (T *); TAO_Objref_Var_T<T> & operator= (const TAO_Objref_Var_T<T> &); - T * operator-> (void) const; + T * operator-> () const; /// Cast operators. operator T * const & () const; @@ -66,17 +66,17 @@ public: typedef T *& _out_type; typedef T * _retn_type; - _in_type in (void) const; - _inout_type inout (void); - _out_type out (void); - _retn_type _retn (void); + _in_type in () const; + _inout_type inout (); + _out_type out (); + _retn_type _retn (); /// TAO extension. - _retn_type ptr (void) const; + _retn_type ptr () const; protected: T * ptr_; - void free (void); + void free (); void reset (T *); private: @@ -105,8 +105,8 @@ public: /// Cast operator. operator T *& (); - T *& ptr (void); - T * operator-> (void); + T *& ptr (); + T * operator-> (); private: T *& ptr_; diff --git a/TAO/tao/On_Demand_Fragmentation_Strategy.cpp b/TAO/tao/On_Demand_Fragmentation_Strategy.cpp index e9b790dd6fa..b5261fde697 100644 --- a/TAO/tao/On_Demand_Fragmentation_Strategy.cpp +++ b/TAO/tao/On_Demand_Fragmentation_Strategy.cpp @@ -17,7 +17,7 @@ TAO_On_Demand_Fragmentation_Strategy::TAO_On_Demand_Fragmentation_Strategy ( } TAO_On_Demand_Fragmentation_Strategy::~TAO_On_Demand_Fragmentation_Strategy ( - void) + ) { } @@ -27,7 +27,7 @@ TAO_On_Demand_Fragmentation_Strategy::fragment ( ACE_CDR::ULong pending_alignment, ACE_CDR::ULong pending_length) { - if (this->transport_ == 0) + if (this->transport_ == nullptr) return 0; // No transport. Can't fragment. TAO_GIOP_Message_Version giop_version; @@ -80,7 +80,7 @@ TAO_On_Demand_Fragmentation_Strategy::fragment ( // bit. if (this->transport_->send_message (cdr, cdr.stub (), - 0, + nullptr, cdr.message_semantics (), cdr.timeout ()) == -1 diff --git a/TAO/tao/On_Demand_Fragmentation_Strategy.h b/TAO/tao/On_Demand_Fragmentation_Strategy.h index ef893a8849a..a695f89f735 100644 --- a/TAO/tao/On_Demand_Fragmentation_Strategy.h +++ b/TAO/tao/On_Demand_Fragmentation_Strategy.h @@ -52,9 +52,10 @@ public: ACE_CDR::ULong pending_length); private: - // Disallow copying and assignment. - TAO_On_Demand_Fragmentation_Strategy (TAO_On_Demand_Fragmentation_Strategy const &); - void operator= (TAO_On_Demand_Fragmentation_Strategy const &); + TAO_On_Demand_Fragmentation_Strategy (TAO_On_Demand_Fragmentation_Strategy const &) = delete; + void operator= (TAO_On_Demand_Fragmentation_Strategy const &) = delete; + TAO_On_Demand_Fragmentation_Strategy (TAO_On_Demand_Fragmentation_Strategy &&) = delete; + void operator= (TAO_On_Demand_Fragmentation_Strategy &&) = delete; private: /// Pointer to the underlying transport object. diff --git a/TAO/tao/PI/ClientRequestDetails.h b/TAO/tao/PI/ClientRequestDetails.h index 2aa46394c6a..9907aa92961 100644 --- a/TAO/tao/PI/ClientRequestDetails.h +++ b/TAO/tao/PI/ClientRequestDetails.h @@ -49,8 +49,7 @@ namespace TAO class ClientRequestDetails { public: - - ClientRequestDetails (void); + ClientRequestDetails (); void apply_policies (const CORBA::PolicyList& policies); @@ -61,7 +60,6 @@ namespace TAO bool should_be_processed (bool is_remote_request) const; private: - /// The ProcessingMode setting that can be adjusted via the /// PortableInterceptor::ProcessingModePolicy. PortableInterceptor::ProcessingMode processing_mode_; diff --git a/TAO/tao/PI/ClientRequestInfo.cpp b/TAO/tao/PI/ClientRequestInfo.cpp index fc7a4980394..d2b95eb562e 100644 --- a/TAO/tao/PI/ClientRequestInfo.cpp +++ b/TAO/tao/PI/ClientRequestInfo.cpp @@ -31,7 +31,7 @@ TAO_ClientRequestInfo::TAO_ClientRequestInfo (TAO::Invocation_Base *inv) } void -TAO_ClientRequestInfo::setup_picurrent (void) +TAO_ClientRequestInfo::setup_picurrent () { // Retrieve the thread scope current (no TSS access incurred yet). CORBA::Object_ptr pi_current_obj = @@ -75,7 +75,7 @@ TAO_ClientRequestInfo::get_service_context_i ( } CORBA::Object_ptr -TAO_ClientRequestInfo::target (void) +TAO_ClientRequestInfo::target () { this->check_validity (); @@ -83,7 +83,7 @@ TAO_ClientRequestInfo::target (void) } CORBA::Object_ptr -TAO_ClientRequestInfo::effective_target (void) +TAO_ClientRequestInfo::effective_target () { this->check_validity (); @@ -91,7 +91,7 @@ TAO_ClientRequestInfo::effective_target (void) } IOP::TaggedProfile * -TAO_ClientRequestInfo::effective_profile (void) +TAO_ClientRequestInfo::effective_profile () { this->check_validity (); @@ -128,7 +128,7 @@ TAO_ClientRequestInfo::effective_profile (void) // exception from an Any. This method is in place just to be compliant // with the spec. CORBA::Any * -TAO_ClientRequestInfo::received_exception (void) +TAO_ClientRequestInfo::received_exception () { this->check_validity (); @@ -163,7 +163,7 @@ TAO_ClientRequestInfo::received_exception (void) } char * -TAO_ClientRequestInfo::received_exception_id (void) +TAO_ClientRequestInfo::received_exception_id () { this->check_validity (); @@ -309,7 +309,7 @@ TAO_ClientRequestInfo::add_request_service_context ( } CORBA::ULong -TAO_ClientRequestInfo::request_id (void) +TAO_ClientRequestInfo::request_id () { this->check_validity (); @@ -393,7 +393,7 @@ TAO_ClientRequestInfo::request_id (void) } char * -TAO_ClientRequestInfo::operation (void) +TAO_ClientRequestInfo::operation () { this->check_validity (); @@ -401,7 +401,7 @@ TAO_ClientRequestInfo::operation (void) } Dynamic::ParameterList * -TAO_ClientRequestInfo::arguments (void) +TAO_ClientRequestInfo::arguments () { this->check_validity (); @@ -443,7 +443,7 @@ TAO_ClientRequestInfo::parameter_list (Dynamic::ParameterList ¶m_list) } Dynamic::ExceptionList * -TAO_ClientRequestInfo::exceptions (void) +TAO_ClientRequestInfo::exceptions () { this->check_validity (); @@ -481,7 +481,7 @@ TAO_ClientRequestInfo::exception_list (Dynamic::ExceptionList &exception_list) } Dynamic::ContextList * -TAO_ClientRequestInfo::contexts (void) +TAO_ClientRequestInfo::contexts () { this->check_validity (); @@ -489,7 +489,7 @@ TAO_ClientRequestInfo::contexts (void) } Dynamic::RequestContext * -TAO_ClientRequestInfo::operation_context (void) +TAO_ClientRequestInfo::operation_context () { this->check_validity (); @@ -497,7 +497,7 @@ TAO_ClientRequestInfo::operation_context (void) } CORBA::Any * -TAO_ClientRequestInfo::result (void) +TAO_ClientRequestInfo::result () { this->check_validity (); @@ -526,7 +526,7 @@ TAO_ClientRequestInfo::result (CORBA::Any *any) } CORBA::Boolean -TAO_ClientRequestInfo::response_expected (void) +TAO_ClientRequestInfo::response_expected () { this->check_validity (); @@ -534,7 +534,7 @@ TAO_ClientRequestInfo::response_expected (void) } Messaging::SyncScope -TAO_ClientRequestInfo::sync_scope (void) +TAO_ClientRequestInfo::sync_scope () { this->check_validity (); @@ -542,7 +542,7 @@ TAO_ClientRequestInfo::sync_scope (void) } PortableInterceptor::ReplyStatus -TAO_ClientRequestInfo::reply_status (void) +TAO_ClientRequestInfo::reply_status () { this->check_validity (); @@ -558,7 +558,7 @@ TAO_ClientRequestInfo::reply_status (void) } CORBA::Object_ptr -TAO_ClientRequestInfo::forward_reference (void) +TAO_ClientRequestInfo::forward_reference () { this->check_validity (); @@ -606,7 +606,7 @@ TAO_ClientRequestInfo::get_reply_service_context (IOP::ServiceId id) } void -TAO_ClientRequestInfo::check_validity (void) +TAO_ClientRequestInfo::check_validity () { if (this->invocation_ == 0) throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); @@ -619,7 +619,7 @@ TAO_ClientRequestInfo::tao_ft_expiration_time (TimeBase::TimeT time) } TimeBase::TimeT -TAO_ClientRequestInfo::tao_ft_expiration_time (void) const +TAO_ClientRequestInfo::tao_ft_expiration_time () const { return this->invocation_->operation_details ().ft_expiration_time (); } @@ -631,7 +631,7 @@ TAO_ClientRequestInfo::tao_ft_retention_id (CORBA::Long request_id) } CORBA::Long -TAO_ClientRequestInfo::tao_ft_retention_id (void) const +TAO_ClientRequestInfo::tao_ft_retention_id () const { return this->invocation_->operation_details ().ft_retention_id (); } diff --git a/TAO/tao/PI/ClientRequestInfo.h b/TAO/tao/PI/ClientRequestInfo.h index 00f692f7ffc..fe41ecb1f83 100644 --- a/TAO/tao/PI/ClientRequestInfo.h +++ b/TAO/tao/PI/ClientRequestInfo.h @@ -75,34 +75,34 @@ public: /// Return an ID unique to the current request. This request ID may /// or may not be the same as the GIOP request ID. - virtual CORBA::ULong request_id (void); + virtual CORBA::ULong request_id (); /// Return the operation name for the current request. - virtual char * operation (void); + virtual char * operation (); /// Return the list of arguments passed to the current operation. - virtual Dynamic::ParameterList * arguments (void); + virtual Dynamic::ParameterList * arguments (); /// Return the list of exceptions the current operation is capable /// of throwing. - virtual Dynamic::ExceptionList * exceptions (void); + virtual Dynamic::ExceptionList * exceptions (); - virtual Dynamic::ContextList * contexts (void); + virtual Dynamic::ContextList * contexts (); - virtual Dynamic::RequestContext * operation_context (void); + virtual Dynamic::RequestContext * operation_context (); /// Return the result of the current request. If there is no return /// value then an Any with tk_void TypeCode is returned. This is /// method is not valid for oneway operations. - virtual CORBA::Any * result (void); + virtual CORBA::Any * result (); /// Returns true for a two-way operation, and false otherwise. - virtual CORBA::Boolean response_expected (void); + virtual CORBA::Boolean response_expected (); /// Return the sync_scope policy value for the current one-way /// operation. If the operation is not a one-way, a /// CORBA::BAD_INV_ORDER exception is thrown. - virtual Messaging::SyncScope sync_scope (void); + virtual Messaging::SyncScope sync_scope (); /// Return the reply status for the current request. /** @@ -110,11 +110,11 @@ public: * SYSTEM_EXCEPTION, USER_EXCEPTION, LOCATION_FORWARD, * TRANSPORT_RETRY, UNKNOWN. */ - virtual PortableInterceptor::ReplyStatus reply_status (void); + virtual PortableInterceptor::ReplyStatus reply_status (); /// If the reply status is PortableInterceptor::LOCATION_FORWARD or /// return the object reference to which the request was forwarded. - virtual CORBA::Object_ptr forward_reference (void); + virtual CORBA::Object_ptr forward_reference (); virtual CORBA::Any * get_slot (PortableInterceptor::SlotId id); @@ -129,23 +129,23 @@ public: /// Return the (initial, non-forwarded, or permanently forwarded) /// object reference of the target. - virtual CORBA::Object_ptr target (void); + virtual CORBA::Object_ptr target (); /// Return the object reference for the current target. The target /// may change in the even of a location forward. - virtual CORBA::Object_ptr effective_target (void); + virtual CORBA::Object_ptr effective_target (); - virtual IOP::TaggedProfile * effective_profile (void); + virtual IOP::TaggedProfile * effective_profile (); /// Return an Any containing the received exception, if any. /// Otherwise, throw a CORBA::BAD_INV_ORDER exception. /** * @note There is no trivial way to extract the exception from an Any. */ - virtual CORBA::Any * received_exception (void); + virtual CORBA::Any * received_exception (); /// Return the repository ID for the received exception. - virtual char * received_exception_id (void); + virtual char * received_exception_id (); /// Return the first IOP::TaggedComponent that matches the given /// IOP::ComponentId in the object reference for the current @@ -176,20 +176,19 @@ public: void tao_ft_expiration_time (TimeBase::TimeT time); /// Get the absolute FT expiration time for this request - TimeBase::TimeT tao_ft_expiration_time (void) const; + TimeBase::TimeT tao_ft_expiration_time () const; /// Set the FT request retention ID for this request. void tao_ft_retention_id (CORBA::Long request_id); /// Get the FT request retention ID for this request. - CORBA::Long tao_ft_retention_id (void) const; + CORBA::Long tao_ft_retention_id () const; /* * End proprietary FT methods. */ private: - bool parameter_list (Dynamic::ParameterList ¶m_list); bool exception_list (Dynamic::ExceptionList &exception_list); @@ -198,11 +197,11 @@ private: /// Check if this ClientRequestInfo object is called within the /// context of a request. - void check_validity (void); + void check_validity (); /// Setup thread scope and request scope /// PortableInterceptor::Current objects. - void setup_picurrent (void); + void setup_picurrent (); /// Helper method to get the request and response service contexts. IOP::ServiceContext *get_service_context_i ( diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp index 6d746b2ea5a..2c4a2db3e32 100644 --- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp +++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp @@ -255,7 +255,7 @@ namespace TAO } void - ClientRequestInterceptor_Adapter_Impl::destroy_interceptors (void) + ClientRequestInterceptor_Adapter_Impl::destroy_interceptors () { this->interceptor_list_.destroy_interceptors (); } diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h index de01f6487f1..3f1c10c7af9 100644 --- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h +++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h @@ -64,7 +64,7 @@ namespace TAO , public TAO_RequestInterceptor_Adapter_Impl { public: - ClientRequestInterceptor_Adapter_Impl (void); + ClientRequestInterceptor_Adapter_Impl (); /** * @name PortableInterceptor Client Side Interception Points @@ -101,7 +101,7 @@ namespace TAO PortableInterceptor::ClientRequestInterceptor_ptr interceptor, const CORBA::PolicyList& policies); - virtual void destroy_interceptors (void); + virtual void destroy_interceptors (); virtual PortableInterceptor::ReplyStatus pi_reply_status ( TAO::Invocation_Base const &invocation_base); diff --git a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp index 2b85812b366..10260d213a7 100644 --- a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp +++ b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp @@ -20,7 +20,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::ClientRequestInterceptor_Adapter* -TAO_ClientRequestInterceptor_Adapter_Factory_Impl::create (void) +TAO_ClientRequestInterceptor_Adapter_Factory_Impl::create () { TAO::ClientRequestInterceptor_Adapter_Impl* obj = 0; ACE_NEW_RETURN (obj, diff --git a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h index 75b079061b3..2166b6491a8 100644 --- a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h +++ b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h @@ -38,7 +38,7 @@ class TAO_PI_Export TAO_ClientRequestInterceptor_Adapter_Factory_Impl : public TAO_ClientRequestInterceptor_Adapter_Factory { public: - virtual TAO::ClientRequestInterceptor_Adapter *create (void); + virtual TAO::ClientRequestInterceptor_Adapter *create (); }; ACE_STATIC_SVC_DECLARE (TAO_ClientRequestInterceptor_Adapter_Factory_Impl) diff --git a/TAO/tao/PI/DLL_Resident_ORB_Initializer.h b/TAO/tao/PI/DLL_Resident_ORB_Initializer.h index 338bfbf4f58..306e088b265 100644 --- a/TAO/tao/PI/DLL_Resident_ORB_Initializer.h +++ b/TAO/tao/PI/DLL_Resident_ORB_Initializer.h @@ -51,13 +51,9 @@ namespace PortableInterceptor const ACE_TCHAR * dll_name); virtual ~DLL_Resident_ORB_Initializer (); - virtual void pre_init ( - ::PortableInterceptor::ORBInitInfo_ptr info - ); + virtual void pre_init (::PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init ( - ::PortableInterceptor::ORBInitInfo_ptr info - ); + virtual void post_init (::PortableInterceptor::ORBInitInfo_ptr info); private: PortableInterceptor::ORBInitializer_var initializer_; diff --git a/TAO/tao/PI/Interceptor_List_T.cpp b/TAO/tao/PI/Interceptor_List_T.cpp index 8e9cdd52325..249b6bc2a84 100644 --- a/TAO/tao/PI/Interceptor_List_T.cpp +++ b/TAO/tao/PI/Interceptor_List_T.cpp @@ -180,8 +180,7 @@ namespace TAO 0, EINVAL ), - CORBA::COMPLETED_NO - ); + CORBA::COMPLETED_NO); } } diff --git a/TAO/tao/PI/Interceptor_List_T.h b/TAO/tao/PI/Interceptor_List_T.h index 77da79213eb..e8fd6b39c04 100644 --- a/TAO/tao/PI/Interceptor_List_T.h +++ b/TAO/tao/PI/Interceptor_List_T.h @@ -60,7 +60,7 @@ namespace TAO }; /// Constructor. - Interceptor_List (void); + Interceptor_List (); void add_interceptor (InterceptorType_ptr_type i); @@ -68,7 +68,7 @@ namespace TAO void add_interceptor (InterceptorType_ptr_type i, const CORBA::PolicyList& policies); - void destroy_interceptors (void); + void destroy_interceptors (); /// Return the registered interceptor in sequence element @a index. RegisteredInterceptor& registered_interceptor (size_t index); @@ -76,7 +76,7 @@ namespace TAO /// Return the interceptor in sequence element @a index. InterceptorType_ptr_type interceptor (size_t index); - size_t size (void) const; + size_t size () const; private: typedef ACE_Array_Base<RegisteredInterceptor > RegisteredArray; diff --git a/TAO/tao/PI/ORBInitInfo.cpp b/TAO/tao/PI/ORBInitInfo.cpp index 1006abbccec..aba8e1fb7b8 100644 --- a/TAO/tao/PI/ORBInitInfo.cpp +++ b/TAO/tao/PI/ORBInitInfo.cpp @@ -35,7 +35,7 @@ TAO::Objref_Traits<TAO_ORBInitInfo>::release (TAO_ORBInitInfo_ptr p) } TAO_ORBInitInfo_ptr -TAO::Objref_Traits<TAO_ORBInitInfo>::nil (void) +TAO::Objref_Traits<TAO_ORBInitInfo>::nil () { return TAO_ORBInitInfo::_nil (); } @@ -61,12 +61,12 @@ TAO_ORBInitInfo::TAO_ORBInitInfo (TAO_ORB_Core *orb_core, { } -TAO_ORBInitInfo::~TAO_ORBInitInfo (void) +TAO_ORBInitInfo::~TAO_ORBInitInfo () { } CORBA::StringSeq * -TAO_ORBInitInfo::arguments (void) +TAO_ORBInitInfo::arguments () { this->check_validity (); @@ -94,7 +94,7 @@ TAO_ORBInitInfo::arguments (void) } char * -TAO_ORBInitInfo::orb_id (void) +TAO_ORBInitInfo::orb_id () { this->check_validity (); @@ -104,7 +104,7 @@ TAO_ORBInitInfo::orb_id (void) } IOP::CodecFactory_ptr -TAO_ORBInitInfo::codec_factory (void) +TAO_ORBInitInfo::codec_factory () { if (CORBA::is_nil (this->codec_factory_.in ())) { @@ -277,7 +277,7 @@ TAO_ORBInitInfo::add_ior_interceptor_with_policy ( } PortableInterceptor::SlotId -TAO_ORBInitInfo::allocate_slot_id (void) +TAO_ORBInitInfo::allocate_slot_id () { this->check_validity (); @@ -333,7 +333,7 @@ TAO_ORBInitInfo::allocate_tss_slot_id (ACE_CLEANUP_FUNC cleanup) } void -TAO_ORBInitInfo::check_validity (void) +TAO_ORBInitInfo::check_validity () { if (this->orb_core_ == 0) { @@ -348,7 +348,7 @@ TAO_ORBInitInfo::check_validity (void) } CORBA::ORB_ptr -TAO_ORBInitInfo::_get_orb (void) +TAO_ORBInitInfo::_get_orb () { this->check_validity (); @@ -379,7 +379,7 @@ TAO_ORBInitInfo::_duplicate (TAO_ORBInitInfo_ptr obj) return obj; } -const char* TAO_ORBInitInfo::_interface_repository_id (void) const +const char* TAO_ORBInitInfo::_interface_repository_id () const { return "IDL:TAO_ORBInitInfo:1.0"; } diff --git a/TAO/tao/PI/ORBInitInfo.h b/TAO/tao/PI/ORBInitInfo.h index 4dc4efdca3f..a8b960f33d4 100644 --- a/TAO/tao/PI/ORBInitInfo.h +++ b/TAO/tao/PI/ORBInitInfo.h @@ -71,14 +71,14 @@ public: //@{ /// Return the argument vector for the ORB currently being /// initialized as a string sequence. - virtual CORBA::StringSeq * arguments (void); + virtual CORBA::StringSeq * arguments (); /// Return the ORBid for the ORB currently being initialized. - virtual char * orb_id (void); + virtual char * orb_id (); /// Return the CodecFactory for the ORB currently being /// initialized. - virtual IOP::CodecFactory_ptr codec_factory (void); + virtual IOP::CodecFactory_ptr codec_factory (); /// Register a mapping between a string and a corresponding object /// reference with the ORB being initialized. @@ -132,7 +132,7 @@ public: /// Reserve a slot in table found within the /// PortableInterceptor::Current object. - virtual PortableInterceptor::SlotId allocate_slot_id (void); + virtual PortableInterceptor::SlotId allocate_slot_id (); /// Register a policy factory of the given policy type with the ORB /// currently being initialized. @@ -140,7 +140,7 @@ public: CORBA::PolicyType type, PortableInterceptor::PolicyFactory_ptr policy_factory); - virtual CORBA::ORB_ptr _get_orb (void); + virtual CORBA::ORB_ptr _get_orb (); //@} /** @@ -171,18 +171,18 @@ public: * * @note Only use this method if you know what you are doing. */ - TAO_ORB_Core *orb_core (void) const; + TAO_ORB_Core *orb_core () const; /// Invalidate this ORBInitInfo instance. /** * @note This method is only meant to be called by the * CORBA::ORB_init() function. */ - void invalidate (void); + void invalidate (); /// Return the number of allocated slots in for the PICurrent /// object. - PortableInterceptor::SlotId slot_count (void) const; + PortableInterceptor::SlotId slot_count () const; //@} /** @@ -202,24 +202,24 @@ public: static TAO_ORBInitInfo_ptr _unchecked_narrow (CORBA::Object_ptr obj); - static TAO_ORBInitInfo_ptr _nil (void) + static TAO_ORBInitInfo_ptr _nil () { return (TAO_ORBInitInfo_ptr)0; } //@} - virtual const char* _interface_repository_id (void) const; + virtual const char* _interface_repository_id () const; protected: /// Destructor is protected to enforce proper memory management /// through the reference counting mechanism. - ~TAO_ORBInitInfo (void); + ~TAO_ORBInitInfo (); /// Check if this ORBInitInfo instance is valid. Once post_init() /// has been called on each of the ORBInitializers, this ORBInitInfo /// is no longer valid. Throw an exception in that case. - void check_validity (void); + void check_validity (); private: @@ -258,7 +258,7 @@ namespace TAO { static TAO_ORBInitInfo_ptr duplicate (TAO_ORBInitInfo_ptr); static void release (TAO_ORBInitInfo_ptr); - static TAO_ORBInitInfo_ptr nil (void); + static TAO_ORBInitInfo_ptr nil (); static CORBA::Boolean marshal (TAO_ORBInitInfo_ptr p, TAO_OutputCDR & cdr); }; } diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp index c74c4f5e385..f21bc49245c 100644 --- a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp +++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp @@ -16,7 +16,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO::ORBInitializer_Registry::ORBInitializer_Registry (void) +TAO::ORBInitializer_Registry::ORBInitializer_Registry () : lock_ (), initializers_ () { @@ -66,7 +66,7 @@ TAO::ORBInitializer_Registry::init (int, ACE_TCHAR *[]) } int -TAO::ORBInitializer_Registry::fini (void) +TAO::ORBInitializer_Registry::fini () { ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, guard, diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.h b/TAO/tao/PI/ORBInitializer_Registry_Impl.h index f6c9de7cd2c..40156abfe85 100644 --- a/TAO/tao/PI/ORBInitializer_Registry_Impl.h +++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.h @@ -43,7 +43,7 @@ namespace TAO : public ORBInitializer_Registry_Adapter { public: - ORBInitializer_Registry (void); + ORBInitializer_Registry (); /// Added to provide registration for the several static service /// objects, brought in with this ORBInitializer_Registry @@ -57,7 +57,7 @@ namespace TAO /// Service config fini method, release all ORBInitializers at this /// moment - virtual int fini (void); + virtual int fini (); /// Register an ORBInitializer with the underlying ORBInitializer /// array. @@ -81,8 +81,8 @@ namespace TAO private: // Prevent copying - ORBInitializer_Registry (const ORBInitializer_Registry &); - void operator= (const ORBInitializer_Registry &); + ORBInitializer_Registry (const ORBInitializer_Registry &) = delete; + void operator= (const ORBInitializer_Registry &) = delete; private: TAO_SYNCH_RECURSIVE_MUTEX lock_; diff --git a/TAO/tao/PI/PI.cpp b/TAO/tao/PI/PI.cpp index 4a8dde4d7a1..319c44c812a 100644 --- a/TAO/tao/PI/PI.cpp +++ b/TAO/tao/PI/PI.cpp @@ -15,7 +15,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // This one is used during static initialization while the other is used // when PI is a shared library. int -TAO_PI_Init::Initializer (void) +TAO_PI_Init::Initializer () { #if TAO_HAS_INTERCEPTORS == 1 ACE_Service_Config::process_directive (ace_svc_desc_TAO_ClientRequestInterceptor_Adapter_Factory_Impl); diff --git a/TAO/tao/PI/PI.h b/TAO/tao/PI/PI.h index 2d0f9cbe662..addfd85df07 100644 --- a/TAO/tao/PI/PI.h +++ b/TAO/tao/PI/PI.h @@ -31,7 +31,7 @@ class TAO_PI_Export TAO_PI_Init public: /// Used to force the initialization of the ORB code. - static int Initializer (void); + static int Initializer (); }; #if defined (TAO_AS_STATIC_LIBS) || (defined (ACE_VXWORKS) && !defined (__RTP__)) diff --git a/TAO/tao/PI/PICurrent.cpp b/TAO/tao/PI/PICurrent.cpp index 2a673e1eb3f..86bb1f2c632 100644 --- a/TAO/tao/PI/PICurrent.cpp +++ b/TAO/tao/PI/PICurrent.cpp @@ -20,10 +20,6 @@ TAO::PICurrent::PICurrent (TAO_ORB_Core &orb_core) { } -TAO::PICurrent::~PICurrent (void) -{ -} - CORBA::Any * TAO::PICurrent::get_slot (PortableInterceptor::SlotId identifier) { @@ -50,14 +46,14 @@ namespace } TAO::PICurrent_Impl * -TAO::PICurrent::tsc (void) +TAO::PICurrent::tsc () { TAO::PICurrent_Impl *impl = static_cast<TAO::PICurrent_Impl *> ( this->orb_core_.get_tss_resource (this->tss_slot_)); // If this TSS has not yet been set-up, give it it's own PICurrent_Impl. - if (0 == impl) + if (!impl) { ACE_NEW_THROW_EX (impl, TAO::PICurrent_Impl (&this->orb_core_, this->tss_slot_), @@ -89,7 +85,7 @@ TAO::PICurrent::check_validity (const PortableInterceptor::SlotId &identifier) } CORBA::ORB_ptr -TAO::PICurrent::_get_orb (void) +TAO::PICurrent::_get_orb () { return CORBA::ORB::_duplicate (this->orb_core_.orb ()); } diff --git a/TAO/tao/PI/PICurrent.h b/TAO/tao/PI/PICurrent.h index c5fb1391941..78ae7d699ec 100644 --- a/TAO/tao/PI/PICurrent.h +++ b/TAO/tao/PI/PICurrent.h @@ -76,14 +76,14 @@ namespace TAO const CORBA::Any & data); //@} - virtual CORBA::ORB_ptr _get_orb (void); + virtual CORBA::ORB_ptr _get_orb (); /// Number of slots allocated in the slot table. - PortableInterceptor::SlotId slot_count (void) const; + PortableInterceptor::SlotId slot_count () const; /// Retrieve the PICurrent implementation from TSS, i.e. the thread /// scope current (TSC). - PICurrent_Impl * tsc (void); + PICurrent_Impl * tsc (); /// Verify the validity of the given SlotId. void check_validity (const PortableInterceptor::SlotId &identifier); @@ -98,14 +98,14 @@ namespace TAO * counted, and should not be destroyed using delete() by anything * other than the reference counting mechanism. */ - virtual ~PICurrent (void); + virtual ~PICurrent () = default; private: /// Prevent copying through the copy constructor and the assignment /// operator. //@{ - PICurrent (const PICurrent &); - void operator= (const PICurrent &); + PICurrent (const PICurrent &) = delete; + void operator= (const PICurrent &) = delete; //@} private: diff --git a/TAO/tao/PI/PICurrent_Impl.cpp b/TAO/tao/PI/PICurrent_Impl.cpp index 3c3ae41dd95..9f8ccaba8f8 100644 --- a/TAO/tao/PI/PICurrent_Impl.cpp +++ b/TAO/tao/PI/PICurrent_Impl.cpp @@ -171,7 +171,7 @@ TAO::PICurrent_Impl::~PICurrent_Impl () } void -TAO::PICurrent_Impl::push (void) +TAO::PICurrent_Impl::push () { if (this->orb_core_) // We have a stack to adjust { @@ -197,7 +197,7 @@ TAO::PICurrent_Impl::push (void) } void -TAO::PICurrent_Impl::pop (void) +TAO::PICurrent_Impl::pop () { if (this->orb_core_) // We have a stack to adjust { diff --git a/TAO/tao/PI/PICurrent_Impl.h b/TAO/tao/PI/PICurrent_Impl.h index 3d22b82bb1e..7819fdda9cc 100644 --- a/TAO/tao/PI/PICurrent_Impl.h +++ b/TAO/tao/PI/PICurrent_Impl.h @@ -52,7 +52,7 @@ namespace TAO size_t tss_slot= 0, PICurrent_Impl *pop= 0); /// Destructor. - ~PICurrent_Impl (void); + ~PICurrent_Impl (); /// Retrieve information stored in the slot table at the given /// SlotId. @@ -66,10 +66,10 @@ namespace TAO void take_lazy_copy (PICurrent_Impl *p); /// Push a new PICurrent_Impl on stack - void push (void); + void push (); /// Pop old PICurrent_Impl from stack - void pop (void); + void pop (); private: /// Force this object to convert from a logical (referenced) @@ -97,8 +97,8 @@ namespace TAO /// Prevent copying through the copy constructor and the assignment /// operator. //@{ - PICurrent_Impl (const PICurrent_Impl &); - void operator= (const PICurrent_Impl &); + PICurrent_Impl (const PICurrent_Impl &) = delete; + void operator= (const PICurrent_Impl &) = delete; //@} private: diff --git a/TAO/tao/PI/PI_ORBInitializer.cpp b/TAO/tao/PI/PI_ORBInitializer.cpp index 5aa02eea3a9..123d4f54ea8 100644 --- a/TAO/tao/PI/PI_ORBInitializer.cpp +++ b/TAO/tao/PI/PI_ORBInitializer.cpp @@ -16,7 +16,6 @@ TAO_PI_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr) { } - void TAO_PI_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info) { @@ -39,7 +38,6 @@ TAO_PI_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info) this->register_policy_factories (info); } - void TAO_PI_ORBInitializer::register_policy_factories ( PortableInterceptor::ORBInitInfo_ptr info) diff --git a/TAO/tao/PI/PI_ORBInitializer.h b/TAO/tao/PI/PI_ORBInitializer.h index 082f9a3fdc5..8a7af55048d 100644 --- a/TAO/tao/PI/PI_ORBInitializer.h +++ b/TAO/tao/PI/PI_ORBInitializer.h @@ -37,7 +37,6 @@ class TAO_PI_Export TAO_PI_ORBInitializer public virtual ::CORBA::LocalObject { public: - /** * @name PortableInterceptor::ORBInitializer methods * @@ -51,7 +50,6 @@ public: //@} private: - /// Register PortableInterceptor policy factories. void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/tao/PI/PI_PolicyFactory.h b/TAO/tao/PI/PI_PolicyFactory.h index fac7f3071af..85236c1f2cf 100644 --- a/TAO/tao/PI/PI_PolicyFactory.h +++ b/TAO/tao/PI/PI_PolicyFactory.h @@ -34,8 +34,7 @@ class TAO_PI_Export TAO_PI_PolicyFactory public virtual ::CORBA::LocalObject { public: - CORBA::Policy_ptr create_policy (CORBA::PolicyType type, - const CORBA::Any & value); + CORBA::Policy_ptr create_policy (CORBA::PolicyType type, const CORBA::Any & value); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/PolicyFactoryC.cpp b/TAO/tao/PI/PolicyFactoryC.cpp index cf36dafbbb1..eb614ce9dbb 100644 --- a/TAO/tao/PI/PolicyFactoryC.cpp +++ b/TAO/tao/PI/PolicyFactoryC.cpp @@ -63,7 +63,7 @@ TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::release ( } PortableInterceptor::PolicyFactory_ptr -TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::nil (void) +TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::nil () { return PortableInterceptor::PolicyFactory::_nil (); } @@ -77,10 +77,10 @@ TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::marshal ( return ::CORBA::Object::marshal (p, cdr); } -PortableInterceptor::PolicyFactory::PolicyFactory (void) +PortableInterceptor::PolicyFactory::PolicyFactory () {} -PortableInterceptor::PolicyFactory::~PolicyFactory (void) +PortableInterceptor::PolicyFactory::~PolicyFactory () {} PortableInterceptor::PolicyFactory_ptr @@ -146,7 +146,7 @@ PortableInterceptor::PolicyFactory::_is_a (const char *value) } } -const char* PortableInterceptor::PolicyFactory::_interface_repository_id (void) const +const char* PortableInterceptor::PolicyFactory::_interface_repository_id () const { return "IDL:omg.org/PortableInterceptor/PolicyFactory:1.0"; } diff --git a/TAO/tao/PI/PolicyFactoryC.h b/TAO/tao/PI/PolicyFactoryC.h index 0b2dfabc75b..f97f52df981 100644 --- a/TAO/tao/PI/PolicyFactoryC.h +++ b/TAO/tao/PI/PolicyFactoryC.h @@ -106,7 +106,7 @@ namespace PortableInterceptor ); - static PolicyFactory_ptr _nil (void) + static PolicyFactory_ptr _nil () { return static_cast<PolicyFactory_ptr> (0); } @@ -137,14 +137,14 @@ namespace PortableInterceptor ); - virtual const char* _interface_repository_id (void) const; + virtual const char* _interface_repository_id () const; virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr); protected: // Abstract or local interface only. - PolicyFactory (void); + PolicyFactory (); - virtual ~PolicyFactory (void); + virtual ~PolicyFactory (); private: // Private and unimplemented for concrete interfaces. @@ -179,7 +179,7 @@ namespace TAO static void release ( ::PortableInterceptor::PolicyFactory_ptr ); - static ::PortableInterceptor::PolicyFactory_ptr nil (void); + static ::PortableInterceptor::PolicyFactory_ptr nil (); static ::CORBA::Boolean marshal ( ::PortableInterceptor::PolicyFactory_ptr p, TAO_OutputCDR & cdr diff --git a/TAO/tao/PI/PolicyFactory_Loader.cpp b/TAO/tao/PI/PolicyFactory_Loader.cpp index 81cd0387879..252e0f9f1cf 100644 --- a/TAO/tao/PI/PolicyFactory_Loader.cpp +++ b/TAO/tao/PI/PolicyFactory_Loader.cpp @@ -17,7 +17,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::PolicyFactory_Registry_Adapter* -TAO_PolicyFactory_Loader::create (void) +TAO_PolicyFactory_Loader::create () { TAO::PolicyFactory_Registry_Adapter* obj = 0; ACE_NEW_RETURN (obj, @@ -27,7 +27,7 @@ TAO_PolicyFactory_Loader::create (void) } int -TAO_PolicyFactory_Loader::Initializer (void) +TAO_PolicyFactory_Loader::Initializer () { return ACE_Service_Config::process_directive (ace_svc_desc_TAO_PolicyFactory_Loader); } diff --git a/TAO/tao/PI/PolicyFactory_Loader.h b/TAO/tao/PI/PolicyFactory_Loader.h index d96c7d39abd..98ad244420f 100644 --- a/TAO/tao/PI/PolicyFactory_Loader.h +++ b/TAO/tao/PI/PolicyFactory_Loader.h @@ -31,10 +31,10 @@ class TAO_PI_Export TAO_PolicyFactory_Loader { public: /// Creates a Codec factory and returns it. - virtual TAO::PolicyFactory_Registry_Adapter* create (void); + virtual TAO::PolicyFactory_Registry_Adapter* create (); /// Used to force the initialization of the ORB code. - static int Initializer (void); + static int Initializer (); }; static int diff --git a/TAO/tao/PI/PolicyFactory_Registry.cpp b/TAO/tao/PI/PolicyFactory_Registry.cpp index 0ff905feef5..fc8d396aece 100644 --- a/TAO/tao/PI/PolicyFactory_Registry.cpp +++ b/TAO/tao/PI/PolicyFactory_Registry.cpp @@ -6,12 +6,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_PolicyFactory_Registry::TAO_PolicyFactory_Registry (void) +TAO_PolicyFactory_Registry::TAO_PolicyFactory_Registry () : factories_ (TAO_DEFAULT_POLICY_FACTORY_REGISTRY_SIZE) { } -TAO_PolicyFactory_Registry::~TAO_PolicyFactory_Registry (void) +TAO_PolicyFactory_Registry::~TAO_PolicyFactory_Registry () { const TABLE::iterator end (this->factories_.end ()); diff --git a/TAO/tao/PI/PolicyFactory_Registry.h b/TAO/tao/PI/PolicyFactory_Registry.h index ddd26b87151..9ea5fb17330 100644 --- a/TAO/tao/PI/PolicyFactory_Registry.h +++ b/TAO/tao/PI/PolicyFactory_Registry.h @@ -39,7 +39,6 @@ class TAO_PolicyFactory_Registry : public TAO::PolicyFactory_Registry_Adapter { public: - /** * The type of table that maps policy type to policy factory. * @@ -51,16 +50,14 @@ public: */ typedef ACE_Map_Manager<CORBA::PolicyType, PortableInterceptor::PolicyFactory_ptr, - ACE_Null_Mutex> - TABLE; + ACE_Null_Mutex> TABLE; public: - /// Constructor - TAO_PolicyFactory_Registry (void); + TAO_PolicyFactory_Registry (); /// Destructor. Releases duplicated PolicyFactory references. - ~TAO_PolicyFactory_Registry (void); + ~TAO_PolicyFactory_Registry (); /// Register a PolicyFactory with the underlying PolicyFactory /// sequence. This method should only be called during ORB @@ -83,10 +80,8 @@ public: bool factory_exists (CORBA::PolicyType & type) const; private: - /// The table that maps policy type to policy factory. TABLE factories_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/ProcessingModePolicy.cpp b/TAO/tao/PI/ProcessingModePolicy.cpp index 046e5014ac4..85938fec13d 100644 --- a/TAO/tao/PI/ProcessingModePolicy.cpp +++ b/TAO/tao/PI/ProcessingModePolicy.cpp @@ -17,9 +17,9 @@ TAO_ProcessingModePolicy::TAO_ProcessingModePolicy } CORBA::Policy_ptr -TAO_ProcessingModePolicy::copy (void) +TAO_ProcessingModePolicy::copy () { - TAO_ProcessingModePolicy *copy = 0; + TAO_ProcessingModePolicy *copy {}; ACE_NEW_THROW_EX (copy, TAO_ProcessingModePolicy (this->processing_mode_), CORBA::NO_MEMORY ()); @@ -28,18 +28,18 @@ TAO_ProcessingModePolicy::copy (void) } void -TAO_ProcessingModePolicy::destroy (void) +TAO_ProcessingModePolicy::destroy () { } PortableInterceptor::ProcessingMode -TAO_ProcessingModePolicy::processing_mode (void) +TAO_ProcessingModePolicy::processing_mode () { return processing_mode_; } CORBA::PolicyType -TAO_ProcessingModePolicy::policy_type (void) +TAO_ProcessingModePolicy::policy_type () { return PortableInterceptor::PROCESSING_MODE_POLICY_TYPE; } diff --git a/TAO/tao/PI/ProcessingModePolicy.h b/TAO/tao/PI/ProcessingModePolicy.h index ce6d12690db..ecc270c8e3d 100644 --- a/TAO/tao/PI/ProcessingModePolicy.h +++ b/TAO/tao/PI/ProcessingModePolicy.h @@ -44,13 +44,13 @@ public: /// Constructor. TAO_ProcessingModePolicy (PortableInterceptor::ProcessingMode mode); - virtual PortableInterceptor::ProcessingMode processing_mode (void); + virtual PortableInterceptor::ProcessingMode processing_mode (); - virtual CORBA::PolicyType policy_type (void); + virtual CORBA::PolicyType policy_type (); - virtual CORBA::Policy_ptr copy (void); + virtual CORBA::Policy_ptr copy (); - virtual void destroy (void); + virtual void destroy (); private: /// The attribute diff --git a/TAO/tao/PI/RequestInfo_Util.cpp b/TAO/tao/PI/RequestInfo_Util.cpp index 29ec2f53511..adb2c7c0597 100644 --- a/TAO/tao/PI/RequestInfo_Util.cpp +++ b/TAO/tao/PI/RequestInfo_Util.cpp @@ -13,7 +13,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL Dynamic::ParameterList * -TAO_RequestInfo_Util::make_parameter_list (void) +TAO_RequestInfo_Util::make_parameter_list () { Dynamic::ParameterList *parameter_list = 0; ACE_NEW_THROW_EX (parameter_list, @@ -30,7 +30,7 @@ TAO_RequestInfo_Util::make_parameter_list (void) } Dynamic::ExceptionList * -TAO_RequestInfo_Util::make_exception_list (void) +TAO_RequestInfo_Util::make_exception_list () { Dynamic::ExceptionList *exception_list = 0; ACE_NEW_THROW_EX (exception_list, @@ -47,7 +47,7 @@ TAO_RequestInfo_Util::make_exception_list (void) } Dynamic::ContextList * -TAO_RequestInfo_Util::make_context_list (void) +TAO_RequestInfo_Util::make_context_list () { Dynamic::ContextList *context_list = 0; ACE_NEW_THROW_EX (context_list, @@ -64,7 +64,7 @@ TAO_RequestInfo_Util::make_context_list (void) } Dynamic::RequestContext * -TAO_RequestInfo_Util::make_request_context (void) +TAO_RequestInfo_Util::make_request_context () { Dynamic::RequestContext *request_context = 0; ACE_NEW_THROW_EX (request_context, diff --git a/TAO/tao/PI/RequestInfo_Util.h b/TAO/tao/PI/RequestInfo_Util.h index cf4c1b20366..56537358735 100644 --- a/TAO/tao/PI/RequestInfo_Util.h +++ b/TAO/tao/PI/RequestInfo_Util.h @@ -51,7 +51,6 @@ namespace Dynamic class TAO_PI_Export TAO_RequestInfo_Util { public: - /** * @name Factory Methods * @@ -61,13 +60,13 @@ public: * class. */ //@{ - static Dynamic::ParameterList * make_parameter_list (void); + static Dynamic::ParameterList * make_parameter_list (); - static Dynamic::ExceptionList * make_exception_list (void); + static Dynamic::ExceptionList * make_exception_list (); - static Dynamic::ContextList * make_context_list (void); + static Dynamic::ContextList * make_context_list (); - static Dynamic::RequestContext * make_request_context (void); + static Dynamic::RequestContext * make_request_context (); static CORBA::Any * make_any (CORBA::Boolean tk_void_any); //@} diff --git a/TAO/tao/PI/RequestInterceptor_Adapter_Impl.cpp b/TAO/tao/PI/RequestInterceptor_Adapter_Impl.cpp index ce14ce596b4..b9c074cd79e 100644 --- a/TAO/tao/PI/RequestInterceptor_Adapter_Impl.cpp +++ b/TAO/tao/PI/RequestInterceptor_Adapter_Impl.cpp @@ -20,7 +20,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_RequestInterceptor_Adapter_Impl::~TAO_RequestInterceptor_Adapter_Impl (void) +TAO_RequestInterceptor_Adapter_Impl::~TAO_RequestInterceptor_Adapter_Impl () { } diff --git a/TAO/tao/PI/RequestInterceptor_Adapter_Impl.h b/TAO/tao/PI/RequestInterceptor_Adapter_Impl.h index a3ff67558ef..44d76c58261 100644 --- a/TAO/tao/PI/RequestInterceptor_Adapter_Impl.h +++ b/TAO/tao/PI/RequestInterceptor_Adapter_Impl.h @@ -43,7 +43,7 @@ class TAO_PI_Export TAO_RequestInterceptor_Adapter_Impl : public TAO::RequestInterceptor_Adapter { public: - ~TAO_RequestInterceptor_Adapter_Impl (void); + ~TAO_RequestInterceptor_Adapter_Impl (); void popTSC (TAO_ORB_Core *orb_core); void pushTSC (TAO_ORB_Core *orb_core); diff --git a/TAO/tao/PI_Server/PICurrent_Guard.cpp b/TAO/tao/PI_Server/PICurrent_Guard.cpp index 87500e8ff82..61f12fffadf 100644 --- a/TAO/tao/PI_Server/PICurrent_Guard.cpp +++ b/TAO/tao/PI_Server/PICurrent_Guard.cpp @@ -53,7 +53,7 @@ TAO::PICurrent_Guard::PICurrent_Guard (TAO_ServerRequest &server_request, } } -TAO::PICurrent_Guard::~PICurrent_Guard (void) +TAO::PICurrent_Guard::~PICurrent_Guard () { if (this->src_ != 0 && this->dest_ != 0 && this->src_ != this->dest_) diff --git a/TAO/tao/PI_Server/PICurrent_Guard.h b/TAO/tao/PI_Server/PICurrent_Guard.h index 8eaee4ec81d..16014c78dca 100644 --- a/TAO/tao/PI_Server/PICurrent_Guard.h +++ b/TAO/tao/PI_Server/PICurrent_Guard.h @@ -72,7 +72,7 @@ namespace TAO * points are invoked, and after the starting and intermediate (if * any) interception points are invoked. */ - ~PICurrent_Guard (void); + ~PICurrent_Guard (); private: diff --git a/TAO/tao/PI_Server/PI_Server.cpp b/TAO/tao/PI_Server/PI_Server.cpp index 0c222f5d26b..322d9be2505 100644 --- a/TAO/tao/PI_Server/PI_Server.cpp +++ b/TAO/tao/PI_Server/PI_Server.cpp @@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL int -TAO_PI_Server_Init::Initializer (void) +TAO_PI_Server_Init::Initializer () { #if TAO_HAS_INTERCEPTORS == 1 ACE_Service_Config::process_directive (ace_svc_desc_TAO_ServerRequestInterceptor_Adapter_Factory_Impl); diff --git a/TAO/tao/PI_Server/PI_Server.h b/TAO/tao/PI_Server/PI_Server.h index 63b7f2b2281..f38922a5209 100644 --- a/TAO/tao/PI_Server/PI_Server.h +++ b/TAO/tao/PI_Server/PI_Server.h @@ -31,7 +31,7 @@ class TAO_PI_Server_Export TAO_PI_Server_Init public: /// Used to force the initialization of the ORB code. - static int Initializer (void); + static int Initializer (); }; static int diff --git a/TAO/tao/PI_Server/PI_Server_Loader.cpp b/TAO/tao/PI_Server/PI_Server_Loader.cpp index 6971657efc8..3c38f5cf1fd 100644 --- a/TAO/tao/PI_Server/PI_Server_Loader.cpp +++ b/TAO/tao/PI_Server/PI_Server_Loader.cpp @@ -8,12 +8,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_PI_Server_Loader::TAO_PI_Server_Loader (void) +TAO_PI_Server_Loader::TAO_PI_Server_Loader () : initialized_ (false) { } -TAO_PI_Server_Loader::~TAO_PI_Server_Loader (void) +TAO_PI_Server_Loader::~TAO_PI_Server_Loader () { } diff --git a/TAO/tao/PI_Server/PI_Server_Loader.h b/TAO/tao/PI_Server/PI_Server_Loader.h index 367a84faa81..d466c9a2564 100644 --- a/TAO/tao/PI_Server/PI_Server_Loader.h +++ b/TAO/tao/PI_Server/PI_Server_Loader.h @@ -27,10 +27,10 @@ class TAO_PI_Server_Export TAO_PI_Server_Loader : public ACE_Service_Object { public: /// Constructor. - TAO_PI_Server_Loader (void); + TAO_PI_Server_Loader (); /// Destructor. - virtual ~TAO_PI_Server_Loader (void); + virtual ~TAO_PI_Server_Loader (); /// Initialize the PI_Server loader hooks. virtual int init (int argc, ACE_TCHAR* []); @@ -40,7 +40,6 @@ private: bool initialized_; }; - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PI_Server, TAO_PI_Server_Loader) ACE_FACTORY_DECLARE (TAO_PI_Server, TAO_PI_Server_Loader) diff --git a/TAO/tao/PI_Server/PortableServer_ORBInitializer.h b/TAO/tao/PI_Server/PortableServer_ORBInitializer.h index d2499fe18a8..cf8df3cfa6d 100644 --- a/TAO/tao/PI_Server/PortableServer_ORBInitializer.h +++ b/TAO/tao/PI_Server/PortableServer_ORBInitializer.h @@ -29,7 +29,6 @@ class TAO_PortableServer_ORBInitializer public virtual ::CORBA::LocalObject { public: - /** * @name PortableInterceptor::ORBInitializer methods * @@ -43,7 +42,6 @@ public: //@} private: - /// Register PortableServer policy factories. void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info); }; diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp index d0cf73ac879..93470b44b2d 100644 --- a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp +++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp @@ -15,7 +15,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO::ServerRequestInterceptor_Adapter_Impl::ServerRequestInterceptor_Adapter_Impl (void) +TAO::ServerRequestInterceptor_Adapter_Impl::ServerRequestInterceptor_Adapter_Impl () { } @@ -229,8 +229,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request ( size_t nargs, TAO::Portable_Server::Servant_Upcall *servant_upcall, CORBA::TypeCode_ptr const * exceptions, - CORBA::ULong nexceptions - ) + CORBA::ULong nexceptions) { // This method implements an "intermediate" server side interception // point. Interceptors are invoked in the same order they were @@ -258,7 +257,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request ( try { - bool is_remote_request = !server_request.collocated (); + bool const is_remote_request = !server_request.collocated (); for (size_t i = 0; i < server_request.interceptor_count (); ++i) { @@ -507,13 +506,13 @@ TAO::ServerRequestInterceptor_Adapter_Impl::add_interceptor ( } void -TAO::ServerRequestInterceptor_Adapter_Impl::destroy_interceptors (void) +TAO::ServerRequestInterceptor_Adapter_Impl::destroy_interceptors () { this->interceptor_list_.destroy_interceptors (); } TAO::PICurrent_Impl * -TAO::ServerRequestInterceptor_Adapter_Impl::allocate_pi_current (void) +TAO::ServerRequestInterceptor_Adapter_Impl::allocate_pi_current () { TAO::PICurrent_Impl *pi = 0; ACE_NEW_RETURN (pi, diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.h b/TAO/tao/PI_Server/ServerInterceptorAdapter.h index 6c3efa5c4c7..15630621c6a 100644 --- a/TAO/tao/PI_Server/ServerInterceptorAdapter.h +++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.h @@ -68,7 +68,7 @@ namespace TAO { public: /// Constructor. - ServerRequestInterceptor_Adapter_Impl (void); + ServerRequestInterceptor_Adapter_Impl (); /** * @name PortableInterceptor Server Side Interception Points @@ -93,7 +93,7 @@ namespace TAO /// This method implements the "intermediate" server side /// interception point if the above #ifdef is set to 1 and a - /// starting intercetion point if it is not set to 1. + /// starting interception point if it is not set to 1. /// /// @note This method should have been the "starting" interception /// point according to the interceptor spec. This will be @@ -154,9 +154,9 @@ namespace TAO PortableInterceptor::ServerRequestInterceptor_ptr interceptor, const CORBA::PolicyList& policies); - virtual void destroy_interceptors (void); + virtual void destroy_interceptors (); - virtual TAO::PICurrent_Impl *allocate_pi_current (void); + virtual TAO::PICurrent_Impl *allocate_pi_current (); virtual void deallocate_pi_current (TAO::PICurrent_Impl *picurrent); diff --git a/TAO/tao/PI_Server/ServerRequestDetails.h b/TAO/tao/PI_Server/ServerRequestDetails.h index 1e47815ef05..69ea625353f 100644 --- a/TAO/tao/PI_Server/ServerRequestDetails.h +++ b/TAO/tao/PI_Server/ServerRequestDetails.h @@ -49,7 +49,7 @@ namespace TAO class ServerRequestDetails { public: - ServerRequestDetails (void); + ServerRequestDetails (); void apply_policies (const CORBA::PolicyList& policies); @@ -60,7 +60,6 @@ namespace TAO bool should_be_processed (bool is_remote_request) const; private: - /// The ProcessingMode setting that can be adjusted via the /// PortableInterceptor::ProcessingModePolicy. PortableInterceptor::ProcessingMode processing_mode_; diff --git a/TAO/tao/PI_Server/ServerRequestInfo.cpp b/TAO/tao/PI_Server/ServerRequestInfo.cpp index bd0a9afa68b..418c92be0b1 100644 --- a/TAO/tao/PI_Server/ServerRequestInfo.cpp +++ b/TAO/tao/PI_Server/ServerRequestInfo.cpp @@ -27,7 +27,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::ULong -TAO::ServerRequestInfo::request_id (void) +TAO::ServerRequestInfo::request_id () { // The request ID returned by this method need not correspond to the // GIOP request ID sent with the client request. The request ID @@ -65,15 +65,15 @@ TAO::ServerRequestInfo::request_id (void) } char * -TAO::ServerRequestInfo::operation (void) +TAO::ServerRequestInfo::operation () { return CORBA::string_dup (this->server_request_.operation ()); } Dynamic::ParameterList * -TAO::ServerRequestInfo::arguments (void) +TAO::ServerRequestInfo::arguments () { - if (this->args_ == 0) + if (!this->args_) { throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); } @@ -115,9 +115,9 @@ TAO::ServerRequestInfo::arguments (void) } Dynamic::ExceptionList * -TAO::ServerRequestInfo::exceptions (void) +TAO::ServerRequestInfo::exceptions () { - if (this->args_ == 0) + if (!this->args_) { throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); } @@ -145,21 +145,21 @@ TAO::ServerRequestInfo::exceptions (void) } Dynamic::ContextList * -TAO::ServerRequestInfo::contexts (void) +TAO::ServerRequestInfo::contexts () { throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); } Dynamic::RequestContext * -TAO::ServerRequestInfo::operation_context (void) +TAO::ServerRequestInfo::operation_context () { throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); } CORBA::Any * -TAO::ServerRequestInfo::result (void) +TAO::ServerRequestInfo::result () { - if (this->args_ == 0) + if (!this->args_) { throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); } @@ -167,8 +167,7 @@ TAO::ServerRequestInfo::result (void) // Generate the result on demand. static CORBA::Boolean const tk_void_any = true; - CORBA::Any * result_any = - TAO_RequestInfo_Util::make_any (tk_void_any); + CORBA::Any * result_any = TAO_RequestInfo_Util::make_any (tk_void_any); CORBA::Any_var safe_result_any = result_any; @@ -181,35 +180,41 @@ TAO::ServerRequestInfo::result (void) } CORBA::Boolean -TAO::ServerRequestInfo::response_expected (void) +TAO::ServerRequestInfo::response_expected () { return this->server_request_.response_expected (); } Messaging::SyncScope -TAO::ServerRequestInfo::sync_scope (void) +TAO::ServerRequestInfo::sync_scope () { if (this->server_request_.sync_with_server ()) + { return Messaging::SYNC_WITH_SERVER; + } throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); } PortableInterceptor::ReplyStatus -TAO::ServerRequestInfo::reply_status (void) +TAO::ServerRequestInfo::reply_status () { if (this->server_request_.pi_reply_status () == -1) + { // A reply hasn't been received yet. throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); + } return this->server_request_.pi_reply_status (); } CORBA::Object_ptr -TAO::ServerRequestInfo::forward_reference (void) +TAO::ServerRequestInfo::forward_reference () { if (this->server_request_.pi_reply_status () != PortableInterceptor::LOCATION_FORWARD) + { throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); + } // TAO_ServerRequest::forward_location() already duplicates the // object reference. There is no need to duplicate it here. @@ -227,7 +232,7 @@ TAO::ServerRequestInfo::get_slot (PortableInterceptor::SlotId id) TAO::PICurrent *pi_current = dynamic_cast <TAO::PICurrent*> (pi_current_obj); - if (pi_current == 0) + if (!pi_current) throw ::CORBA::INTERNAL (); pi_current->check_validity (id); @@ -236,7 +241,6 @@ TAO::ServerRequestInfo::get_slot (PortableInterceptor::SlotId id) TAO::PICurrent_Impl *rsc = this->server_request_.rs_pi_current (); return rsc->get_slot (id); - } IOP::ServiceContext * @@ -280,7 +284,7 @@ TAO::ServerRequestInfo::get_service_context_i ( // exception from an Any. This method is in place just to be compliant // with the spec. CORBA::Any * -TAO::ServerRequestInfo::sending_exception (void) +TAO::ServerRequestInfo::sending_exception () { if (this->server_request_.pi_reply_status () != PortableInterceptor::SYSTEM_EXCEPTION && this->server_request_.pi_reply_status () != PortableInterceptor::USER_EXCEPTION) @@ -291,8 +295,7 @@ TAO::ServerRequestInfo::sending_exception (void) // The spec says that if it is a user exception which cannot be // inserted then the UNKNOWN exception should be thrown with minor // code 1. - - CORBA::Any * temp = 0; + CORBA::Any * temp {}; ACE_NEW_THROW_EX (temp, CORBA::Any, @@ -304,56 +307,61 @@ TAO::ServerRequestInfo::sending_exception (void) CORBA::Any_var caught_exception_var = temp; - if (this->server_request_.caught_exception () != 0) + if (this->server_request_.caught_exception ()) + { (*temp) <<= *(this->server_request_.caught_exception ()); + } return caught_exception_var._retn (); } char * -TAO::ServerRequestInfo::server_id (void) +TAO::ServerRequestInfo::server_id () { - if (this->servant_upcall_ != 0) - return - CORBA::string_dup (this->server_request_.orb_core ()->server_id ()); + if (this->servant_upcall_) + { + return CORBA::string_dup (this->server_request_.orb_core ()->server_id ()); + } throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); } char * -TAO::ServerRequestInfo::orb_id (void) +TAO::ServerRequestInfo::orb_id () { - if (this->servant_upcall_ != 0) - return - CORBA::string_dup (this->server_request_.orb_core ()->orbid ()); + if (this->servant_upcall_) + { + return CORBA::string_dup (this->server_request_.orb_core ()->orbid ()); + } throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); } PortableInterceptor::AdapterName * -TAO::ServerRequestInfo::adapter_name (void) +TAO::ServerRequestInfo::adapter_name () { // The adapter_name attribute defines a name for the object adapter // that services requests for the invoked object. In the case of the // POA, the adapter_name is the sequence of names from the root POA // to the POA that services the request. The root POA is not named // in this sequence. - if (this->servant_upcall_ != 0) - return - this->servant_upcall_->poa ().adapter_name (); + if (this->servant_upcall_) + { + return this->servant_upcall_->poa ().adapter_name (); + } throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); } PortableInterceptor::ObjectId * -TAO::ServerRequestInfo::object_id (void) +TAO::ServerRequestInfo::object_id () { if (this->servant_upcall_ != 0) { const PortableServer::ObjectId &id = this->servant_upcall_->user_id (); - PortableInterceptor::ObjectId *tmp = 0; + PortableInterceptor::ObjectId *tmp {}; ACE_NEW_THROW_EX (tmp, PortableInterceptor::ObjectId, @@ -385,21 +393,25 @@ TAO::ServerRequestInfo::object_id (void) } CORBA::OctetSeq * -TAO::ServerRequestInfo::adapter_id (void) +TAO::ServerRequestInfo::adapter_id () { - if (this->servant_upcall_ != 0) + if (this->servant_upcall_) + { return this->servant_upcall_->poa ().id (); + } throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); } char * -TAO::ServerRequestInfo::target_most_derived_interface (void) +TAO::ServerRequestInfo::target_most_derived_interface () { - PortableServer::Servant const servant = - (this->servant_upcall_ == 0 - ? 0 - : this->servant_upcall_->servant ()); + if (this->servant_upcall_ == 0) + { + throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); + } + + PortableServer::Servant const servant = this->servant_upcall_->servant (); if (servant == 0) { @@ -446,7 +458,7 @@ TAO::ServerRequestInfo::set_slot (PortableInterceptor::SlotId id, TAO::PICurrent *pi_current = dynamic_cast <TAO::PICurrent*> (pi_current_obj); - if (pi_current == 0) + if (!pi_current) throw ::CORBA::INTERNAL (); pi_current->check_validity (id); @@ -460,12 +472,13 @@ TAO::ServerRequestInfo::set_slot (PortableInterceptor::SlotId id, CORBA::Boolean TAO::ServerRequestInfo::target_is_a (const char * id) { - // Implemented in the generated skeleton. + if (this->servant_upcall_ == 0) + { + throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); + } - PortableServer::Servant const servant = - (this->servant_upcall_ == 0 - ? 0 - : this->servant_upcall_->servant ()); + // Implemented in the generated skeleton. + PortableServer::Servant const servant = this->servant_upcall_->servant (); if (servant == 0) { diff --git a/TAO/tao/PI_Server/ServerRequestInfo.h b/TAO/tao/PI_Server/ServerRequestInfo.h index af0274b0509..279a231b79c 100644 --- a/TAO/tao/PI_Server/ServerRequestInfo.h +++ b/TAO/tao/PI_Server/ServerRequestInfo.h @@ -70,7 +70,6 @@ namespace TAO , public virtual ::CORBA::LocalObject { public: - /// Constructor. ServerRequestInfo (TAO_ServerRequest & server_request, TAO::Argument * const * args, @@ -81,34 +80,34 @@ namespace TAO /// Return an ID unique to the current request. This request ID may /// or may not be the same as the GIOP request ID. - virtual CORBA::ULong request_id (void); + virtual CORBA::ULong request_id (); /// Return the operation name for the current request. - virtual char * operation (void); + virtual char * operation (); /// Return the list of arguments passed to the current operation. - virtual Dynamic::ParameterList * arguments (void); + virtual Dynamic::ParameterList * arguments (); /// Return the list of exceptions the current operation is capable /// of throwing. - virtual Dynamic::ExceptionList * exceptions (void); + virtual Dynamic::ExceptionList * exceptions (); - virtual Dynamic::ContextList * contexts (void); + virtual Dynamic::ContextList * contexts (); - virtual Dynamic::RequestContext * operation_context (void); + virtual Dynamic::RequestContext * operation_context (); /// Return the result of the current request. If there is no /// return value then an @c Any with @c tk_void @c TypeCode is /// returned. This method is not valid for oneway operations. - virtual CORBA::Any * result (void); + virtual CORBA::Any * result (); /// Returns @c true for a two-way operation, and @c false otherwise. - virtual CORBA::Boolean response_expected (void); + virtual CORBA::Boolean response_expected (); /// Return the @c sync_scope policy value for the current one-way /// operation. If the operation is not a one-way, a /// @c CORBA::BAD_INV_ORDER exception is thrown. - virtual Messaging::SyncScope sync_scope (void); + virtual Messaging::SyncScope sync_scope (); /// Return the reply status for the current request. /** @@ -116,12 +115,12 @@ namespace TAO * @c SYSTEM_EXCEPTION, @c USER_EXCEPTION, @c LOCATION_FORWARD, * @c TRANSPORT_RETRY, @c UNKNOWN.. */ - virtual PortableInterceptor::ReplyStatus reply_status (void); + virtual PortableInterceptor::ReplyStatus reply_status (); /// If the reply status is /// @c PortableInterceptor::LOCATION_FORWARD return the /// object reference to which the request was forwarded. - virtual CORBA::Object_ptr forward_reference (void); + virtual CORBA::Object_ptr forward_reference (); /// Retrieve data from the "request scope" @c PICurrent object. virtual CORBA::Any * get_slot (PortableInterceptor::SlotId id); @@ -142,29 +141,29 @@ namespace TAO * @note There is no trivial way to extract the exception from an * @c Any. */ - virtual CORBA::Any * sending_exception (void); + virtual CORBA::Any * sending_exception (); /// Return the @c ObjectId for the target object. - virtual PortableInterceptor::ObjectId * object_id (void); + virtual PortableInterceptor::ObjectId * object_id (); /// Return the @c AdapterId for the POA handling the current /// request. - virtual CORBA::OctetSeq * adapter_id (void); + virtual CORBA::OctetSeq * adapter_id (); /// Return the server_id of the server. The value is passed to /// the ORB via @c -ORBServerId parameter. - virtual char * server_id (void); + virtual char * server_id (); /// Return the ORBId value that is passed to the @c ORB_init /// call. - virtual char * orb_id (void); + virtual char * orb_id (); /// Return the name of the object adapter that services requests /// for the invoked object. - virtual PortableInterceptor::AdapterName * adapter_name (void); + virtual PortableInterceptor::AdapterName * adapter_name (); /// Return the most derived interface of the target object. - virtual char * target_most_derived_interface (void); + virtual char * target_most_derived_interface (); /// Return the policy of the given type in effect for the current /// request. @@ -185,7 +184,6 @@ namespace TAO CORBA::Boolean replace); public: - /** * @name Helper methods specific to TAO. */ @@ -209,10 +207,9 @@ namespace TAO /// Return a reference to the underlying @c TAO_ServerRequest /// object. - TAO_ServerRequest &server_request (void); + TAO_ServerRequest &server_request (); protected: - /// Helper method to get the request and response service /// contexts. IOP::ServiceContext * get_service_context_i ( @@ -220,7 +217,6 @@ namespace TAO IOP::ServiceId id); protected: - /// Underlying request object that contains much of the /// information encapsulated by this @c ServerRequestInfo /// implementation. diff --git a/TAO/tao/PI_Server/ServerRequestInfo.inl b/TAO/tao/PI_Server/ServerRequestInfo.inl index 190306e3b6c..836e40c0572 100644 --- a/TAO/tao/PI_Server/ServerRequestInfo.inl +++ b/TAO/tao/PI_Server/ServerRequestInfo.inl @@ -1,7 +1,6 @@ // -*- C++ -*- #include "tao/PortableServer/Servant_Upcall.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE @@ -27,7 +26,6 @@ TAO::ServerRequestInfo::forward_reference ( { // Note that we're converting the ForwardRequest exception in to a // LOCATION_FORWARD reply, so we do not set the exception status. - this->server_request_.pi_reply_status (PortableInterceptor::LOCATION_FORWARD); // Store the forward reference in the TAO_ServerRequest object. @@ -39,7 +37,6 @@ TAO::ServerRequestInfo::forward_reference (CORBA::Object_ptr obj) { // We only get here if a servant manager threw a // PortableServer::ForwardRequest exception. - this->server_request_.pi_reply_status (PortableInterceptor::LOCATION_FORWARD); // Store the forward reference in the TAO_ServerRequest object. diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp b/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp index 30d7fe51d1a..80f6f6100b5 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp +++ b/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp @@ -64,7 +64,7 @@ TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::release ( } PortableInterceptor::ServerRequestInterceptor_ptr -TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::nil (void) +TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::nil () { return PortableInterceptor::ServerRequestInterceptor::_nil (); } @@ -78,10 +78,10 @@ TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::marshal ( return ::CORBA::Object::marshal (p, cdr); } -PortableInterceptor::ServerRequestInterceptor::ServerRequestInterceptor (void) +PortableInterceptor::ServerRequestInterceptor::ServerRequestInterceptor () {} -PortableInterceptor::ServerRequestInterceptor::~ServerRequestInterceptor (void) +PortableInterceptor::ServerRequestInterceptor::~ServerRequestInterceptor () {} PortableInterceptor::ServerRequestInterceptor_ptr @@ -156,7 +156,7 @@ PortableInterceptor::ServerRequestInterceptor::_is_a ( } } -const char* PortableInterceptor::ServerRequestInterceptor::_interface_repository_id (void) const +const char* PortableInterceptor::ServerRequestInterceptor::_interface_repository_id () const { return "IDL:omg.org/PortableInterceptor/ServerRequestInterceptor:1.0"; } diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorC.h b/TAO/tao/PI_Server/ServerRequestInterceptorC.h index 676567e42ef..4dce9d6cc6a 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptorC.h +++ b/TAO/tao/PI_Server/ServerRequestInterceptorC.h @@ -131,7 +131,7 @@ namespace PortableInterceptor ); - static ServerRequestInterceptor_ptr _nil (void) + static ServerRequestInterceptor_ptr _nil () { return static_cast<ServerRequestInterceptor_ptr> (0); } @@ -203,14 +203,14 @@ namespace PortableInterceptor ); - virtual const char* _interface_repository_id (void) const; + virtual const char* _interface_repository_id () const; virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr); protected: // Abstract or local interface only. - ServerRequestInterceptor (void); + ServerRequestInterceptor (); - virtual ~ServerRequestInterceptor (void); + virtual ~ServerRequestInterceptor (); private: // Private and unimplemented for concrete interfaces. @@ -245,7 +245,7 @@ namespace TAO static void release ( ::PortableInterceptor::ServerRequestInfo_ptr ); - static ::PortableInterceptor::ServerRequestInfo_ptr nil (void); + static ::PortableInterceptor::ServerRequestInfo_ptr nil (); static ::CORBA::Boolean marshal ( ::PortableInterceptor::ServerRequestInfo_ptr p, TAO_OutputCDR & cdr @@ -266,7 +266,7 @@ namespace TAO static void release ( ::PortableInterceptor::ServerRequestInterceptor_ptr ); - static ::PortableInterceptor::ServerRequestInterceptor_ptr nil (void); + static ::PortableInterceptor::ServerRequestInterceptor_ptr nil (); static ::CORBA::Boolean marshal ( ::PortableInterceptor::ServerRequestInterceptor_ptr p, TAO_OutputCDR & cdr diff --git a/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp b/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp index f04d2565187..c4123f9b325 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp +++ b/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp @@ -20,7 +20,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::ServerRequestInterceptor_Adapter* -TAO_ServerRequestInterceptor_Adapter_Factory_Impl::create (void) +TAO_ServerRequestInterceptor_Adapter_Factory_Impl::create () { TAO::ServerRequestInterceptor_Adapter_Impl* obj = 0; ACE_NEW_RETURN (obj, diff --git a/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h b/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h index 7c7abdab60b..9cacd9b0172 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h +++ b/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h @@ -38,7 +38,7 @@ class TAO_PI_Server_Export TAO_ServerRequestInterceptor_Adapter_Factory_Impl : public TAO_ServerRequestInterceptor_Adapter_Factory { public: - virtual TAO::ServerRequestInterceptor_Adapter *create (void); + virtual TAO::ServerRequestInterceptor_Adapter *create (); }; diff --git a/TAO/tao/Parser_Registry.cpp b/TAO/tao/Parser_Registry.cpp index cd35119b474..eed0f04a2cd 100644 --- a/TAO/tao/Parser_Registry.cpp +++ b/TAO/tao/Parser_Registry.cpp @@ -11,13 +11,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Parser_Registry::TAO_Parser_Registry (void) - : parsers_ (0), +TAO_Parser_Registry::TAO_Parser_Registry () + : parsers_ (nullptr), size_ (0) { } -TAO_Parser_Registry::~TAO_Parser_Registry (void) +TAO_Parser_Registry::~TAO_Parser_Registry () { delete [] this->parsers_; } @@ -25,10 +25,10 @@ TAO_Parser_Registry::~TAO_Parser_Registry (void) int TAO_Parser_Registry::open (TAO_ORB_Core *orb_core) { - char **names = 0; + char **names = nullptr; int number_of_names = 0; - if (orb_core->resource_factory () == 0) + if (orb_core->resource_factory () == nullptr) { return -1; } @@ -51,7 +51,7 @@ TAO_Parser_Registry::open (TAO_ORB_Core *orb_core) ACE_Dynamic_Service<TAO_IOR_Parser>::instance (orb_core->configuration (), names [i]); - if (this->parsers_[index] == 0) + if (this->parsers_[index] == nullptr) { --number_of_names; if (TAO_debug_level >= 1) @@ -81,7 +81,7 @@ TAO_Parser_Registry::match_parser (const char *ior_string) } } - return 0; + return nullptr; } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Parser_Registry.h b/TAO/tao/Parser_Registry.h index daacd764291..91c355f9bf0 100644 --- a/TAO/tao/Parser_Registry.h +++ b/TAO/tao/Parser_Registry.h @@ -45,10 +45,10 @@ class TAO_Export TAO_Parser_Registry { public: /// Default constructor. - TAO_Parser_Registry (void); + TAO_Parser_Registry (); /// Dstructor. - ~TAO_Parser_Registry (void); + ~TAO_Parser_Registry (); /// Initialize the parser registry with the list of known protocols. /// Invoked by the ORB during startup. @@ -60,8 +60,8 @@ public: // = Iterator. typedef TAO_IOR_Parser** Parser_Iterator; - Parser_Iterator begin (void) const; - Parser_Iterator end (void) const; + Parser_Iterator begin () const; + Parser_Iterator end () const; private: diff --git a/TAO/tao/Pluggable_Messaging_Utils.cpp b/TAO/tao/Pluggable_Messaging_Utils.cpp index fd43f298cee..28b548ce1df 100644 --- a/TAO/tao/Pluggable_Messaging_Utils.cpp +++ b/TAO/tao/Pluggable_Messaging_Utils.cpp @@ -8,7 +8,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Pluggable_Reply_Params::TAO_Pluggable_Reply_Params (TAO_Transport *t) - : input_cdr_ (0) + : input_cdr_ (nullptr) , transport_ (t) { } diff --git a/TAO/tao/Pluggable_Messaging_Utils.h b/TAO/tao/Pluggable_Messaging_Utils.h index 484ccbd5925..6cab6a91408 100644 --- a/TAO/tao/Pluggable_Messaging_Utils.h +++ b/TAO/tao/Pluggable_Messaging_Utils.h @@ -41,7 +41,7 @@ class TAO_Export TAO_Pluggable_Reply_Params_Base { public: /// Constructor. - TAO_Pluggable_Reply_Params_Base (void); + TAO_Pluggable_Reply_Params_Base (); /// The IOP service context list. IOP::ServiceContextList svc_ctx_; @@ -66,17 +66,17 @@ public: * a service context list and would like to pass on their contents * without a copy. */ - IOP::ServiceContextList &service_context_notowned (void); + IOP::ServiceContextList &service_context_notowned (); void service_context_notowned (IOP::ServiceContextList *svc); /// A flag that indicates if there is any data is going to get /// marshalled in the reply CORBA::Boolean argument_flag_; - GIOP::ReplyStatusType reply_status (void) const; + GIOP::ReplyStatusType reply_status () const; void reply_status (GIOP::ReplyStatusType status); - GIOP::LocateStatusType locate_reply_status (void) const; + GIOP::LocateStatusType locate_reply_status () const; void locate_reply_status (GIOP::LocateStatusType status); protected: diff --git a/TAO/tao/PolicyFactory_Registry_Adapter.cpp b/TAO/tao/PolicyFactory_Registry_Adapter.cpp index 6c75b805ad4..7ec9258e60c 100644 --- a/TAO/tao/PolicyFactory_Registry_Adapter.cpp +++ b/TAO/tao/PolicyFactory_Registry_Adapter.cpp @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO::PolicyFactory_Registry_Adapter::~PolicyFactory_Registry_Adapter (void) +TAO::PolicyFactory_Registry_Adapter::~PolicyFactory_Registry_Adapter () { } diff --git a/TAO/tao/PolicyFactory_Registry_Adapter.h b/TAO/tao/PolicyFactory_Registry_Adapter.h index 275a419cbc2..e359b804871 100644 --- a/TAO/tao/PolicyFactory_Registry_Adapter.h +++ b/TAO/tao/PolicyFactory_Registry_Adapter.h @@ -53,7 +53,7 @@ namespace TAO class TAO_Export PolicyFactory_Registry_Adapter { public: - virtual ~PolicyFactory_Registry_Adapter (void); + virtual ~PolicyFactory_Registry_Adapter (); /// Register a PolicyFactory with the underlying PolicyFactory /// sequence. This method should only be called during ORB diff --git a/TAO/tao/PolicyFactory_Registry_Factory.cpp b/TAO/tao/PolicyFactory_Registry_Factory.cpp index 3ba55302382..6bf506d8222 100644 --- a/TAO/tao/PolicyFactory_Registry_Factory.cpp +++ b/TAO/tao/PolicyFactory_Registry_Factory.cpp @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_PolicyFactory_Registry_Factory::~TAO_PolicyFactory_Registry_Factory (void) +TAO_PolicyFactory_Registry_Factory::~TAO_PolicyFactory_Registry_Factory () { } diff --git a/TAO/tao/PolicyFactory_Registry_Factory.h b/TAO/tao/PolicyFactory_Registry_Factory.h index bc214fe55ba..19b6e383f72 100644 --- a/TAO/tao/PolicyFactory_Registry_Factory.h +++ b/TAO/tao/PolicyFactory_Registry_Factory.h @@ -34,9 +34,9 @@ class TAO_Export TAO_PolicyFactory_Registry_Factory : public ACE_Service_Object { public: - virtual ~TAO_PolicyFactory_Registry_Factory (void); + virtual ~TAO_PolicyFactory_Registry_Factory (); - virtual TAO::PolicyFactory_Registry_Adapter* create (void) = 0; + virtual TAO::PolicyFactory_Registry_Adapter* create () = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Policy_Current.cpp b/TAO/tao/Policy_Current.cpp index a4ec5b8a0dd..0631b65435d 100644 --- a/TAO/tao/Policy_Current.cpp +++ b/TAO/tao/Policy_Current.cpp @@ -21,7 +21,7 @@ TAO_Policy_Current::implementation (TAO_Policy_Current_Impl ¤t) } TAO_Policy_Current_Impl & -TAO_Policy_Current::implementation (void) const +TAO_Policy_Current::implementation () const { return *TAO_TSS_Resources::instance ()->policy_current_; } diff --git a/TAO/tao/Policy_Current_Impl.h b/TAO/tao/Policy_Current_Impl.h index 98aaebff6f1..d370f8a7255 100644 --- a/TAO/tao/Policy_Current_Impl.h +++ b/TAO/tao/Policy_Current_Impl.h @@ -36,7 +36,7 @@ class TAO_Policy_Current_Impl { public: - TAO_Policy_Current_Impl (void); + TAO_Policy_Current_Impl (); /// Obtain a single policy. CORBA::Policy_ptr get_policy (CORBA::PolicyType policy); diff --git a/TAO/tao/Policy_Manager.cpp b/TAO/tao/Policy_Manager.cpp index fbfaea4a28b..87320fbca67 100644 --- a/TAO/tao/Policy_Manager.cpp +++ b/TAO/tao/Policy_Manager.cpp @@ -11,7 +11,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::PolicyList * TAO_Policy_Manager::get_policy_overrides (const CORBA::PolicyTypeSeq & ts) { - ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, nullptr); return this->impl_.get_policy_overrides (ts); } diff --git a/TAO/tao/Policy_Manager.h b/TAO/tao/Policy_Manager.h index 619fb506e3f..97a2fea0484 100644 --- a/TAO/tao/Policy_Manager.h +++ b/TAO/tao/Policy_Manager.h @@ -54,9 +54,10 @@ public: CORBA::SetOverrideType set_add); private: - // Disallow copying. - TAO_Policy_Manager (TAO_Policy_Manager const &); - TAO_Policy_Manager & operator= (TAO_Policy_Manager const &); + TAO_Policy_Manager (TAO_Policy_Manager const &) = delete; + TAO_Policy_Manager & operator= (TAO_Policy_Manager const &) = delete; + TAO_Policy_Manager (TAO_Policy_Manager &&) = delete; + TAO_Policy_Manager & operator= (TAO_Policy_Manager &&) = delete; private: /// Protect access diff --git a/TAO/tao/Policy_Set.cpp b/TAO/tao/Policy_Set.cpp index bd3507cfebb..c7e28444dba 100644 --- a/TAO/tao/Policy_Set.cpp +++ b/TAO/tao/Policy_Set.cpp @@ -14,10 +14,10 @@ TAO_Policy_Set::TAO_Policy_Set (TAO_Policy_Scope scope) : scope_ (scope) { for (unsigned int i = 0; i < TAO_CACHED_POLICY_MAX_CACHED; ++i) - this->cached_policies_[i] = 0; + this->cached_policies_[i] = nullptr; } -TAO_Policy_Set::~TAO_Policy_Set (void) +TAO_Policy_Set::~TAO_Policy_Set () { try { @@ -35,7 +35,7 @@ TAO_Policy_Set::TAO_Policy_Set (const TAO_Policy_Set &rhs) // Initialize the cache. for (int i = 0; i < TAO_CACHED_POLICY_MAX_CACHED; ++i) { - this->cached_policies_[i] = 0; + this->cached_policies_[i] = nullptr; } // Copy over the policy list. @@ -78,7 +78,7 @@ TAO_Policy_Set::TAO_Policy_Set (const TAO_Policy_Set &rhs) void TAO_Policy_Set::copy_from (TAO_Policy_Set *source) { - if (source == 0) + if (source == nullptr) { return; } @@ -119,7 +119,7 @@ TAO_Policy_Set::copy_from (TAO_Policy_Set *source) } void -TAO_Policy_Set::cleanup_i (void) +TAO_Policy_Set::cleanup_i () { CORBA::ULong const len = this->policy_list_.length (); // Cleanup the policy list. @@ -134,7 +134,7 @@ TAO_Policy_Set::cleanup_i (void) // Cleanup the cache. for (CORBA::ULong j = 0; j < TAO_CACHED_POLICY_MAX_CACHED; ++j) { - this->cached_policies_[j] = 0; + this->cached_policies_[j] = nullptr; } } @@ -247,7 +247,7 @@ CORBA::PolicyList * TAO_Policy_Set::get_policy_overrides (const CORBA::PolicyTypeSeq &types) { CORBA::ULong const slots = types.length (); - CORBA::PolicyList *policy_list_ptr = 0; + CORBA::PolicyList *policy_list_ptr = nullptr; if (slots == 0) { diff --git a/TAO/tao/Policy_Set.h b/TAO/tao/Policy_Set.h index 36d8d6c7bc7..1e415564ecd 100644 --- a/TAO/tao/Policy_Set.h +++ b/TAO/tao/Policy_Set.h @@ -48,7 +48,7 @@ public: TAO_Policy_Set (const TAO_Policy_Set &rhs); /// Destructor - ~TAO_Policy_Set (void); + ~TAO_Policy_Set (); /// Copy the state from @a source, it uses the copy() operator to /// obtain independent copies of all the policies. @@ -93,14 +93,14 @@ public: /// @c CORBA::Policy::_nil () is returned if the policy doesn't /// exist. CORBA::Policy *get_policy_by_index (CORBA::ULong index) const; - CORBA::ULong num_policies (void) const; + CORBA::ULong num_policies () const; private: TAO_Policy_Set & operator= (const TAO_Policy_Set&); /// Remove and destroy all the policy objects owned by this policy /// manager. - void cleanup_i (void); + void cleanup_i (); /// Utility method to determine if a policy's scope is compatible with ours. CORBA::Boolean compatible_scope (TAO_Policy_Scope policy_scope) const; diff --git a/TAO/tao/Policy_Validator.cpp b/TAO/tao/Policy_Validator.cpp index 8cacaf38dc9..d2580db35b1 100644 --- a/TAO/tao/Policy_Validator.cpp +++ b/TAO/tao/Policy_Validator.cpp @@ -6,11 +6,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Policy_Validator::TAO_Policy_Validator (TAO_ORB_Core &orb_core) : orb_core_ (orb_core), - next_ (0) + next_ (nullptr) { } -TAO_Policy_Validator::~TAO_Policy_Validator (void) +TAO_Policy_Validator::~TAO_Policy_Validator () { delete this->next_; } @@ -25,7 +25,7 @@ void TAO_Policy_Validator::add_validator (TAO_Policy_Validator *validator) { // The validator we're adding can't be part of another list - ACE_ASSERT (validator->next_ == 0); + ACE_ASSERT (validator->next_ == nullptr); // Why would we want to add ourself to our list if (this != validator) @@ -33,7 +33,7 @@ TAO_Policy_Validator::add_validator (TAO_Policy_Validator *validator) // Get to the end of the list and make sure that the // new validator isn't already part of our list TAO_Policy_Validator* current = this; - while (current->next_ != 0) + while (current->next_ != nullptr) { if (current->next_ == validator) { @@ -61,7 +61,7 @@ TAO_Policy_Validator::validate (TAO_Policy_Set &policies) { this->validate_impl (policies); - if (this->next_ != 0) + if (this->next_ != nullptr) { this->next_->validate (policies); } @@ -82,7 +82,7 @@ CORBA::Boolean TAO_Policy_Validator::legal_policy (CORBA::PolicyType type) { return (this->legal_policy_impl (type) - || ((this->next_ != 0) + || ((this->next_ != nullptr) && this->next_->legal_policy_impl (type))); } diff --git a/TAO/tao/Policy_Validator.h b/TAO/tao/Policy_Validator.h index b4ae5a0b7ad..8b26beb62f3 100644 --- a/TAO/tao/Policy_Validator.h +++ b/TAO/tao/Policy_Validator.h @@ -54,7 +54,7 @@ public: TAO_Policy_Validator (TAO_ORB_Core &orb_core); /// Destructor. - virtual ~TAO_Policy_Validator (void); + virtual ~TAO_Policy_Validator (); /** * Validate that the policies in the specified set diff --git a/TAO/tao/PortableServer/Acceptor_Filter_Factory.h b/TAO/tao/PortableServer/Acceptor_Filter_Factory.h index 383f423fe73..88fa02f2182 100644 --- a/TAO/tao/PortableServer/Acceptor_Filter_Factory.h +++ b/TAO/tao/PortableServer/Acceptor_Filter_Factory.h @@ -50,12 +50,12 @@ class TAO_PortableServer_Export TAO_Acceptor_Filter_Factory : public ACE_Service_Object { public: - virtual ~TAO_Acceptor_Filter_Factory(void); + virtual ~TAO_Acceptor_Filter_Factory(); virtual TAO_Acceptor_Filter* create_object (TAO_POA_Manager& poamanager); /// Static initializer ensures the factory is loaded - static int initialize (void); + static int initialize (); }; diff --git a/TAO/tao/PortableServer/Active_Object_Map.cpp b/TAO/tao/PortableServer/Active_Object_Map.cpp index b556fa72579..bd30f17ad50 100644 --- a/TAO/tao/PortableServer/Active_Object_Map.cpp +++ b/TAO/tao/PortableServer/Active_Object_Map.cpp @@ -116,11 +116,7 @@ TAO_Active_Object_Map::TAO_Active_Object_Map ( } // Give ownership to the auto pointer. -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO_Id_Uniqueness_Strategy> new_id_uniqueness_strategy (id_uniqueness_strategy); -#else - auto_ptr<TAO_Id_Uniqueness_Strategy> new_id_uniqueness_strategy (id_uniqueness_strategy); -#endif /* ACE_HAS_CPP11 */ TAO_Lifespan_Strategy *lifespan_strategy = 0; @@ -144,11 +140,7 @@ TAO_Active_Object_Map::TAO_Active_Object_Map ( } // Give ownership to the auto pointer. -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO_Lifespan_Strategy> new_lifespan_strategy (lifespan_strategy); -#else - auto_ptr<TAO_Lifespan_Strategy> new_lifespan_strategy (lifespan_strategy); -#endif /* ACE_HAS_CPP11 */ TAO_Id_Assignment_Strategy *id_assignment_strategy = 0; @@ -183,11 +175,7 @@ TAO_Active_Object_Map::TAO_Active_Object_Map ( } // Give ownership to the auto pointer. -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO_Id_Assignment_Strategy> new_id_assignment_strategy (id_assignment_strategy); -#else - auto_ptr<TAO_Id_Assignment_Strategy> new_id_assignment_strategy (id_assignment_strategy); -#endif /* ACE_HAS_CPP11 */ TAO_Id_Hint_Strategy *id_hint_strategy = 0; if ((user_id_policy @@ -209,11 +197,7 @@ TAO_Active_Object_Map::TAO_Active_Object_Map ( } // Give ownership to the auto pointer. -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO_Id_Hint_Strategy> new_id_hint_strategy (id_hint_strategy); -#else - auto_ptr<TAO_Id_Hint_Strategy> new_id_hint_strategy (id_hint_strategy); -#endif /* ACE_HAS_CPP11 */ servant_map *sm = 0; if (unique_id_policy) @@ -247,11 +231,7 @@ TAO_Active_Object_Map::TAO_Active_Object_Map ( } // Give ownership to the auto pointer. -#if defined (ACE_HAS_CPP11) std::unique_ptr<servant_map> new_servant_map (sm); -#else - auto_ptr<servant_map> new_servant_map (sm); -#endif /* ACE_HAS_CPP11 */ user_id_map *uim = 0; if (user_id_policy @@ -321,11 +301,7 @@ TAO_Active_Object_Map::TAO_Active_Object_Map ( } // Give ownership to the auto pointer. -#if defined (ACE_HAS_CPP11) std::unique_ptr<user_id_map> new_user_id_map (uim); -#else - auto_ptr<user_id_map> new_user_id_map (uim); -#endif /* ACE_HAS_CPP11 */ id_uniqueness_strategy->set_active_object_map (this); lifespan_strategy->set_active_object_map (this); @@ -333,21 +309,12 @@ TAO_Active_Object_Map::TAO_Active_Object_Map ( // Finally everything is fine. Make sure to take ownership away // from the auto pointer. -#if defined (ACE_HAS_CPP11) this->id_uniqueness_strategy_ = std::move(new_id_uniqueness_strategy); this->lifespan_strategy_ = std::move(new_lifespan_strategy); this->id_assignment_strategy_ = std::move(new_id_assignment_strategy); this->id_hint_strategy_ = std::move(new_id_hint_strategy); this->servant_map_ = std::move(new_servant_map); this->user_id_map_ = std::move(new_user_id_map); -#else - this->id_uniqueness_strategy_ = new_id_uniqueness_strategy; - this->lifespan_strategy_ = new_lifespan_strategy; - this->id_assignment_strategy_ = new_id_assignment_strategy; - this->id_hint_strategy_ = new_id_hint_strategy; - this->servant_map_ = new_servant_map; - this->user_id_map_ = new_user_id_map; -#endif /* ACE_HAS_CPP11 */ #if defined (TAO_HAS_MONITOR_POINTS) && (TAO_HAS_MONITOR_POINTS == 1) ACE_NEW (this->monitor_, diff --git a/TAO/tao/PortableServer/Active_Object_Map.h b/TAO/tao/PortableServer/Active_Object_Map.h index a37e2fcaee5..d2b688d7dd6 100644 --- a/TAO/tao/PortableServer/Active_Object_Map.h +++ b/TAO/tao/PortableServer/Active_Object_Map.h @@ -57,7 +57,7 @@ public: const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters); /// Destructor. - ~TAO_Active_Object_Map (void); + ~TAO_Active_Object_Map (); /// Must be used with UNIQUE_ID policy. int @@ -179,11 +179,11 @@ public: /// Size of the map. size_t - current_size (void); + current_size (); /// Can be used with any policy. static size_t - system_id_size (void); + system_id_size (); /// Set the system id size. static void @@ -237,46 +237,22 @@ public: #endif /* TAO_HAS_MINIMUM_POA_MAPS == 0 */ /// Id map. -#if defined (ACE_HAS_CPP11) std::unique_ptr<user_id_map> user_id_map_; -#else - auto_ptr<user_id_map> user_id_map_; -#endif /* ACE_HAS_CPP11 */ /// Servant map. -#if defined (ACE_HAS_CPP11) std::unique_ptr<servant_map> servant_map_; -#else - auto_ptr<servant_map> servant_map_; -#endif /* ACE_HAS_CPP11 */ /// Id uniqueness strategy. -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO_Id_Uniqueness_Strategy> id_uniqueness_strategy_; -#else - auto_ptr<TAO_Id_Uniqueness_Strategy> id_uniqueness_strategy_; -#endif /* ACE_HAS_CPP11 */ /// Lifespan strategy. -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO_Lifespan_Strategy> lifespan_strategy_; -#else - auto_ptr<TAO_Lifespan_Strategy> lifespan_strategy_; -#endif /* ACE_HAS_CPP11 */ /// Id assignment strategy. -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO_Id_Assignment_Strategy> id_assignment_strategy_; -#else - auto_ptr<TAO_Id_Assignment_Strategy> id_assignment_strategy_; -#endif /* ACE_HAS_CPP11 */ /// Id hint strategy. -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO_Id_Hint_Strategy> id_hint_strategy_; -#else - auto_ptr<TAO_Id_Hint_Strategy> id_hint_strategy_; -#endif /* ACE_HAS_CPP11 */ /// Flag to see if we are using active maps in this active object /// map. @@ -302,7 +278,7 @@ class TAO_Id_Uniqueness_Strategy { public: /// Virtual destructor. - virtual ~TAO_Id_Uniqueness_Strategy (void); + virtual ~TAO_Id_Uniqueness_Strategy (); /// Must be used with UNIQUE_ID policy. virtual int @@ -461,7 +437,7 @@ class TAO_Lifespan_Strategy public: /// Virtual destructor. - virtual ~TAO_Lifespan_Strategy (void); + virtual ~TAO_Lifespan_Strategy (); /// Can be used with any policy. virtual int @@ -533,7 +509,7 @@ class TAO_Id_Assignment_Strategy { public: /// Virtual destructor. - virtual ~TAO_Id_Assignment_Strategy (void); + virtual ~TAO_Id_Assignment_Strategy (); /// Must be used with SYSTEM_ID policy. virtual int @@ -620,7 +596,7 @@ class TAO_Id_Hint_Strategy { public: /// Virtual destructor. - virtual ~TAO_Id_Hint_Strategy (void); + virtual ~TAO_Id_Hint_Strategy (); /// Find the user id from the system id. virtual int @@ -642,7 +618,7 @@ public: /// How big is the hint generated by this strategy? virtual size_t - hint_size (void) = 0; + hint_size () = 0; /// Get the system id associated with this entry. virtual int @@ -663,7 +639,7 @@ public: TAO_Active_Hint_Strategy (CORBA::ULong map_size); /// Virtual destructor. - virtual ~TAO_Active_Hint_Strategy (void); + virtual ~TAO_Active_Hint_Strategy (); virtual int recover_key (const PortableServer::ObjectId &system_id, @@ -680,7 +656,7 @@ public: TAO_Active_Object_Map_Entry *&entry); virtual size_t - hint_size (void); + hint_size (); virtual int system_id (PortableServer::ObjectId_out system_id, @@ -705,7 +681,7 @@ class TAO_No_Hint_Strategy : public TAO_Id_Hint_Strategy { public: /// Virtual destructor. - virtual ~TAO_No_Hint_Strategy (void); + virtual ~TAO_No_Hint_Strategy (); virtual int recover_key (const PortableServer::ObjectId &system_id, @@ -722,7 +698,7 @@ public: TAO_Active_Object_Map_Entry *&entry); virtual size_t - hint_size (void); + hint_size (); virtual int system_id (PortableServer::ObjectId_out system_id, diff --git a/TAO/tao/PortableServer/Active_Object_Map_Entry.h b/TAO/tao/PortableServer/Active_Object_Map_Entry.h index 8fc2c4504d8..45429d8b0e8 100644 --- a/TAO/tao/PortableServer/Active_Object_Map_Entry.h +++ b/TAO/tao/PortableServer/Active_Object_Map_Entry.h @@ -35,7 +35,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL struct TAO_Active_Object_Map_Entry { /// Default constructor. - TAO_Active_Object_Map_Entry (void); + TAO_Active_Object_Map_Entry (); /// User id. PortableServer::ObjectId user_id_; diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.h b/TAO/tao/PortableServer/Active_Policy_Strategies.h index fd983213528..b683ed244eb 100644 --- a/TAO/tao/PortableServer/Active_Policy_Strategies.h +++ b/TAO/tao/PortableServer/Active_Policy_Strategies.h @@ -50,27 +50,26 @@ namespace TAO class Active_Policy_Strategies { public: - Active_Policy_Strategies (void); + Active_Policy_Strategies (); void update (Cached_Policies &policies, - TAO_Root_POA* poa - ); + TAO_Root_POA* poa); - void cleanup (void); + void cleanup (); - ThreadStrategy *thread_strategy (void) const; + ThreadStrategy *thread_strategy () const; - RequestProcessingStrategy *request_processing_strategy (void) const; + RequestProcessingStrategy *request_processing_strategy () const; - IdAssignmentStrategy *id_assignment_strategy (void) const; + IdAssignmentStrategy *id_assignment_strategy () const; - IdUniquenessStrategy *id_uniqueness_strategy (void) const; + IdUniquenessStrategy *id_uniqueness_strategy () const; - LifespanStrategy *lifespan_strategy (void) const; + LifespanStrategy *lifespan_strategy () const; - ImplicitActivationStrategy *implicit_activation_strategy (void) const; + ImplicitActivationStrategy *implicit_activation_strategy () const; - ServantRetentionStrategy *servant_retention_strategy (void) const; + ServantRetentionStrategy *servant_retention_strategy () const; private: ThreadStrategy *thread_strategy_; @@ -98,9 +97,9 @@ namespace TAO { public: Active_Policy_Strategies_Cleanup_Guard (Active_Policy_Strategies *p); - ~Active_Policy_Strategies_Cleanup_Guard (void); + ~Active_Policy_Strategies_Cleanup_Guard (); - Active_Policy_Strategies *_retn (void); + Active_Policy_Strategies *_retn (); private: Active_Policy_Strategies *ptr_; diff --git a/TAO/tao/PortableServer/Basic_SArgument_T.h b/TAO/tao/PortableServer/Basic_SArgument_T.h index ab9d9e0e694..634f04ef1e3 100644 --- a/TAO/tao/PortableServer/Basic_SArgument_T.h +++ b/TAO/tao/PortableServer/Basic_SArgument_T.h @@ -34,13 +34,13 @@ namespace TAO class In_Basic_SArgument_T : public InArgument { public: - In_Basic_SArgument_T (void); + In_Basic_SArgument_T (); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S arg (void) const; + S arg () const; private: S x_; @@ -56,14 +56,14 @@ namespace TAO class Inout_Basic_SArgument_T : public InoutArgument { public: - Inout_Basic_SArgument_T (void); + Inout_Basic_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S & arg (void); + S & arg (); private: S x_; @@ -79,13 +79,13 @@ namespace TAO class Out_Basic_SArgument_T : public OutArgument { public: - Out_Basic_SArgument_T (void); + Out_Basic_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S & arg (void); + S & arg (); private: S x_; @@ -101,13 +101,13 @@ namespace TAO class Ret_Basic_SArgument_T : public RetArgument { public: - Ret_Basic_SArgument_T (void); + Ret_Basic_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S & arg (void); + S & arg (); private: S x_; diff --git a/TAO/tao/PortableServer/Collocated_Arguments_Converter.h b/TAO/tao/PortableServer/Collocated_Arguments_Converter.h index 384db9dc465..656de9a53d2 100644 --- a/TAO/tao/PortableServer/Collocated_Arguments_Converter.h +++ b/TAO/tao/PortableServer/Collocated_Arguments_Converter.h @@ -41,7 +41,7 @@ class TAO_PortableServer_Export Collocated_Arguments_Converter : { public: - virtual ~Collocated_Arguments_Converter (void); + virtual ~Collocated_Arguments_Converter (); virtual void convert_request (TAO_ServerRequest & server_request, TAO::Argument * const args[], diff --git a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp index 572842ebe02..fa862566239 100644 --- a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp +++ b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp @@ -210,13 +210,13 @@ namespace TAO // ----------------------------------------------------- TAO::Collocated_Object_Proxy_Broker * -the_tao_collocated_object_proxy_broker (void) +the_tao_collocated_object_proxy_broker () { static TAO::Collocated_Object_Proxy_Broker the_broker; return &the_broker; } -TAO::Object_Proxy_Broker * _TAO_collocation_Object_Proxy_Broker_Factory (void) +TAO::Object_Proxy_Broker * _TAO_collocation_Object_Proxy_Broker_Factory () { return the_tao_collocated_object_proxy_broker (); } diff --git a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h index 45c29fc8f13..fcd7e2f0db8 100644 --- a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h +++ b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h @@ -66,7 +66,7 @@ namespace TAO /// This function is used to access the unique instance of strategized /// proxy broker. All the CORBA::Object share the proxy broker. -TAO::Collocated_Object_Proxy_Broker *the_tao_collocated_object_proxy_broker (void); +TAO::Collocated_Object_Proxy_Broker *the_tao_collocated_object_proxy_broker (); TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Creation_Time.h b/TAO/tao/PortableServer/Creation_Time.h index 18de6b7250e..4b13c32be55 100644 --- a/TAO/tao/PortableServer/Creation_Time.h +++ b/TAO/tao/PortableServer/Creation_Time.h @@ -35,13 +35,13 @@ namespace TAO public: explicit Creation_Time (const ACE_Time_Value &creation_time); - Creation_Time (void); + Creation_Time (); void creation_time (const void *creation_time); - const void *creation_time (void) const; + const void *creation_time () const; - static CORBA::ULong creation_time_length (void); + static CORBA::ULong creation_time_length (); bool operator== (const Creation_Time &rhs) const; @@ -76,7 +76,7 @@ namespace TAO { public: - Temporary_Creation_Time (void); + Temporary_Creation_Time (); void creation_time (const void *creation_time); diff --git a/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp b/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp index 7c4a1d1412e..ec9ae61a7a8 100644 --- a/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp +++ b/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp @@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Default_Acceptor_Filter::TAO_Default_Acceptor_Filter (void) +TAO_Default_Acceptor_Filter::TAO_Default_Acceptor_Filter () { } diff --git a/TAO/tao/PortableServer/Default_Acceptor_Filter.h b/TAO/tao/PortableServer/Default_Acceptor_Filter.h index 5e811e4f16e..c440b985c5d 100644 --- a/TAO/tao/PortableServer/Default_Acceptor_Filter.h +++ b/TAO/tao/PortableServer/Default_Acceptor_Filter.h @@ -41,7 +41,7 @@ class TAO_PortableServer_Export TAO_Default_Acceptor_Filter : public TAO_Acceptor_Filter { public: - TAO_Default_Acceptor_Filter (void); + TAO_Default_Acceptor_Filter (); /// Populate @a mprofile with all available endpoints. virtual int fill_profile (const TAO::ObjectKey &object_key, diff --git a/TAO/tao/PortableServer/Default_Policy_Validator.cpp b/TAO/tao/PortableServer/Default_Policy_Validator.cpp index 1c852f9d8a4..84c6d9f06a2 100644 --- a/TAO/tao/PortableServer/Default_Policy_Validator.cpp +++ b/TAO/tao/PortableServer/Default_Policy_Validator.cpp @@ -12,7 +12,7 @@ TAO_POA_Default_Policy_Validator::TAO_POA_Default_Policy_Validator ( { } -TAO_POA_Default_Policy_Validator::~TAO_POA_Default_Policy_Validator (void) +TAO_POA_Default_Policy_Validator::~TAO_POA_Default_Policy_Validator () { } diff --git a/TAO/tao/PortableServer/Default_Policy_Validator.h b/TAO/tao/PortableServer/Default_Policy_Validator.h index 5642928e9d0..e0f17e71dd4 100644 --- a/TAO/tao/PortableServer/Default_Policy_Validator.h +++ b/TAO/tao/PortableServer/Default_Policy_Validator.h @@ -35,7 +35,7 @@ public: TAO_POA_Default_Policy_Validator (TAO_ORB_Core &orb_core); /// Destructor. - ~TAO_POA_Default_Policy_Validator (void); + ~TAO_POA_Default_Policy_Validator (); protected: /** diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp index ec83ebed582..ff020b8af2d 100644 --- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp +++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp @@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Default_Servant_Dispatcher::~TAO_Default_Servant_Dispatcher (void) +TAO_Default_Servant_Dispatcher::~TAO_Default_Servant_Dispatcher () { } diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.h b/TAO/tao/PortableServer/Default_Servant_Dispatcher.h index 20abb7509be..a77043c28d2 100644 --- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.h +++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.h @@ -34,7 +34,7 @@ class TAO_PortableServer_Export TAO_Default_Servant_Dispatcher : public TAO_Servant_Dispatcher { public: - virtual ~TAO_Default_Servant_Dispatcher (void); + virtual ~TAO_Default_Servant_Dispatcher (); /// Pre_invoke remote request. void pre_invoke_remote_request ( diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h index 6b29a0872b6..45c969025fb 100644 --- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h +++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h @@ -36,13 +36,13 @@ namespace TAO class In_Fixed_Array_SArgument_T : public InArgument { public: - In_Fixed_Array_SArgument_T (void); + In_Fixed_Array_SArgument_T (); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - typename S_forany::_slice_type const * arg (void) const; + typename S_forany::_slice_type const * arg () const; private: mutable typename S_forany::_array_type x_; @@ -58,14 +58,14 @@ namespace TAO class Inout_Fixed_Array_SArgument_T : public InoutArgument { public: - Inout_Fixed_Array_SArgument_T (void); + Inout_Fixed_Array_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); virtual CORBA::Boolean demarshal (TAO_InputCDR &cdr); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - typename S_forany::_slice_type * arg (void); + typename S_forany::_slice_type * arg (); private: mutable typename S_forany::_array_type x_; @@ -81,13 +81,13 @@ namespace TAO class Out_Fixed_Array_SArgument_T : public OutArgument { public: - Out_Fixed_Array_SArgument_T (void); + Out_Fixed_Array_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - typename S_forany::_slice_type * arg (void); + typename S_forany::_slice_type * arg (); private: mutable typename S_forany::_array_type x_; @@ -105,13 +105,13 @@ namespace TAO class Ret_Fixed_Array_SArgument_T : public RetArgument { public: - Ret_Fixed_Array_SArgument_T (void); + Ret_Fixed_Array_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - typename S_forany::_slice_type *& arg (void); + typename S_forany::_slice_type *& arg (); private: S_var x_; diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h index 7d0b27b8cc1..44889cf37be 100644 --- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h +++ b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h @@ -56,7 +56,7 @@ namespace TAO //@} /// Retrieve underlying argument. - S const & arg (void) const; + S const & arg () const; private: @@ -79,7 +79,7 @@ namespace TAO public: /// Constructor. - Inout_Fixed_Size_SArgument_T (void); + Inout_Fixed_Size_SArgument_T (); /** * @name @c TAO::Argument Method Overrides @@ -97,7 +97,7 @@ namespace TAO #endif /* TAO_HAS_INTERCEPTORS == 1 */ //@} - S & arg (void); + S & arg (); private: @@ -118,7 +118,7 @@ namespace TAO public: /// Constructor. - Out_Fixed_Size_SArgument_T (void); + Out_Fixed_Size_SArgument_T (); /** * @name @c TAO::Argument Method Overrides @@ -135,7 +135,7 @@ namespace TAO #endif /* TAO_HAS_INTERCEPTORS == 1 */ //@} - S & arg (void); + S & arg (); private: @@ -157,7 +157,7 @@ namespace TAO public: /// Constructor. - Ret_Fixed_Size_SArgument_T (void); + Ret_Fixed_Size_SArgument_T (); /** * @name @c TAO::Argument Method Overrides @@ -174,7 +174,7 @@ namespace TAO #endif /* TAO_HAS_INTERCEPTORS == 1 */ //@} - S & arg (void); + S & arg (); private: diff --git a/TAO/tao/PortableServer/IdAssignmentPolicy.cpp b/TAO/tao/PortableServer/IdAssignmentPolicy.cpp index 449065c15c2..21f763b3aa6 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicy.cpp +++ b/TAO/tao/PortableServer/IdAssignmentPolicy.cpp @@ -18,7 +18,7 @@ namespace TAO } CORBA::Policy_ptr - IdAssignmentPolicy::copy (void) + IdAssignmentPolicy::copy () { IdAssignmentPolicy *copy = 0; ACE_NEW_THROW_EX (copy, @@ -29,30 +29,30 @@ namespace TAO } void - IdAssignmentPolicy::destroy (void) + IdAssignmentPolicy::destroy () { } ::PortableServer::IdAssignmentPolicyValue - IdAssignmentPolicy::value (void) + IdAssignmentPolicy::value () { return value_; } CORBA::PolicyType - IdAssignmentPolicy::policy_type (void) + IdAssignmentPolicy::policy_type () { return ::PortableServer::ID_ASSIGNMENT_POLICY_ID; } TAO_Cached_Policy_Type - IdAssignmentPolicy::_tao_cached_type (void) const + IdAssignmentPolicy::_tao_cached_type () const { return TAO_CACHED_POLICY_ID_ASSIGNMENT; } TAO_Policy_Scope - IdAssignmentPolicy::_tao_scope (void) const + IdAssignmentPolicy::_tao_scope () const { return TAO_POLICY_POA_SCOPE; } diff --git a/TAO/tao/PortableServer/IdAssignmentPolicy.h b/TAO/tao/PortableServer/IdAssignmentPolicy.h index c2688b5f98a..82686e026dc 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicy.h +++ b/TAO/tao/PortableServer/IdAssignmentPolicy.h @@ -43,19 +43,19 @@ namespace TAO public: IdAssignmentPolicy (::PortableServer::IdAssignmentPolicyValue value); - CORBA::Policy_ptr copy (void); + CORBA::Policy_ptr copy (); - void destroy (void); + void destroy (); - ::PortableServer::IdAssignmentPolicyValue value (void); + ::PortableServer::IdAssignmentPolicyValue value (); - CORBA::PolicyType policy_type (void); + CORBA::PolicyType policy_type (); /// Return the cached policy type for this policy. - virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; + virtual TAO_Cached_Policy_Type _tao_cached_type () const; /// Returns the scope at which this policy can be applied. See orbconf.h. - virtual TAO_Policy_Scope _tao_scope (void) const; + virtual TAO_Policy_Scope _tao_scope () const; private: ::PortableServer::IdAssignmentPolicyValue value_; diff --git a/TAO/tao/PortableServer/IdAssignmentStrategy.cpp b/TAO/tao/PortableServer/IdAssignmentStrategy.cpp index aa56af91575..100a129d208 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategy.cpp +++ b/TAO/tao/PortableServer/IdAssignmentStrategy.cpp @@ -12,12 +12,12 @@ namespace TAO } void - IdAssignmentStrategy::strategy_cleanup(void) + IdAssignmentStrategy::strategy_cleanup() { } char - IdAssignmentStrategy::key_type_length (void) const + IdAssignmentStrategy::key_type_length () const { return sizeof (char); } diff --git a/TAO/tao/PortableServer/IdAssignmentStrategy.h b/TAO/tao/PortableServer/IdAssignmentStrategy.h index 88bcfce0eee..dca18216db1 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategy.h +++ b/TAO/tao/PortableServer/IdAssignmentStrategy.h @@ -32,21 +32,21 @@ namespace TAO public: virtual void strategy_init(TAO_Root_POA *poa); - virtual void strategy_cleanup(void); + virtual void strategy_cleanup(); /** * Returns the key type the says which specific policy we have */ - virtual char id_assignment_key_type (void) const = 0; + virtual char id_assignment_key_type () const = 0; /** * Returns the length of the id_assignment type */ - char key_type_length (void) const; + char key_type_length () const; void create_key (CORBA::Octet *buffer, CORBA::ULong& starting_at); - virtual bool has_system_id (void) const = 0; + virtual bool has_system_id () const = 0; }; } } diff --git a/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp b/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp index dd95809054b..30d87e69e9f 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp +++ b/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp @@ -8,13 +8,13 @@ namespace TAO namespace Portable_Server { char - IdAssignmentStrategySystem::id_assignment_key_type (void) const + IdAssignmentStrategySystem::id_assignment_key_type () const { return 'S'; } bool - IdAssignmentStrategySystem::has_system_id (void) const + IdAssignmentStrategySystem::has_system_id () const { return true; } diff --git a/TAO/tao/PortableServer/IdAssignmentStrategySystem.h b/TAO/tao/PortableServer/IdAssignmentStrategySystem.h index e57fc043e30..7ee2acb36f4 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategySystem.h +++ b/TAO/tao/PortableServer/IdAssignmentStrategySystem.h @@ -31,9 +31,9 @@ namespace TAO : public IdAssignmentStrategy { public: - virtual char id_assignment_key_type (void) const; + virtual char id_assignment_key_type () const; - virtual bool has_system_id (void) const; + virtual bool has_system_id () const; }; } } diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp b/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp index 57685cf2f83..622dbd3f4ef 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp +++ b/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp @@ -7,13 +7,13 @@ namespace TAO namespace Portable_Server { char - IdAssignmentStrategyUser::id_assignment_key_type (void) const + IdAssignmentStrategyUser::id_assignment_key_type () const { return 'U'; } bool - IdAssignmentStrategyUser::has_system_id (void) const + IdAssignmentStrategyUser::has_system_id () const { return false; } diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyUser.h b/TAO/tao/PortableServer/IdAssignmentStrategyUser.h index 7740e89ee86..c64be097bce 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategyUser.h +++ b/TAO/tao/PortableServer/IdAssignmentStrategyUser.h @@ -31,9 +31,9 @@ namespace TAO : public IdAssignmentStrategy { public: - virtual char id_assignment_key_type (void) const; + virtual char id_assignment_key_type () const; - virtual bool has_system_id (void) const; + virtual bool has_system_id () const; }; } } diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.cpp b/TAO/tao/PortableServer/IdUniquenessPolicy.cpp index aedf4a9b876..ce0297809b5 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicy.cpp +++ b/TAO/tao/PortableServer/IdUniquenessPolicy.cpp @@ -19,7 +19,7 @@ namespace TAO } CORBA::Policy_ptr - IdUniquenessPolicy::copy (void) + IdUniquenessPolicy::copy () { IdUniquenessPolicy *copy = 0; ACE_NEW_THROW_EX (copy, @@ -30,30 +30,30 @@ namespace TAO } void - IdUniquenessPolicy::destroy (void) + IdUniquenessPolicy::destroy () { } ::PortableServer::IdUniquenessPolicyValue - IdUniquenessPolicy::value (void) + IdUniquenessPolicy::value () { return value_; } CORBA::PolicyType - IdUniquenessPolicy::policy_type (void) + IdUniquenessPolicy::policy_type () { return ::PortableServer::ID_UNIQUENESS_POLICY_ID; } TAO_Cached_Policy_Type - IdUniquenessPolicy::_tao_cached_type (void) const + IdUniquenessPolicy::_tao_cached_type () const { return TAO_CACHED_POLICY_ID_UNIQUENESS; } TAO_Policy_Scope - IdUniquenessPolicy::_tao_scope (void) const + IdUniquenessPolicy::_tao_scope () const { return TAO_POLICY_POA_SCOPE; } diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.h b/TAO/tao/PortableServer/IdUniquenessPolicy.h index d621b5b9d17..3ecbf3b3492 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicy.h +++ b/TAO/tao/PortableServer/IdUniquenessPolicy.h @@ -43,19 +43,19 @@ namespace TAO public: IdUniquenessPolicy (::PortableServer::IdUniquenessPolicyValue value); - CORBA::Policy_ptr copy (void); + CORBA::Policy_ptr copy (); - void destroy (void); + void destroy (); - ::PortableServer::IdUniquenessPolicyValue value (void); + ::PortableServer::IdUniquenessPolicyValue value (); - CORBA::PolicyType policy_type (void); + CORBA::PolicyType policy_type (); /// Return the cached policy type for this policy. - virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; + virtual TAO_Cached_Policy_Type _tao_cached_type () const; /// Returns the scope at which this policy can be applied. See orbconf.h. - virtual TAO_Policy_Scope _tao_scope (void) const; + virtual TAO_Policy_Scope _tao_scope () const; private: ::PortableServer::IdUniquenessPolicyValue value_; diff --git a/TAO/tao/PortableServer/IdUniquenessStrategy.h b/TAO/tao/PortableServer/IdUniquenessStrategy.h index 210d3284ddb..b3372d94343 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategy.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategy.h @@ -41,7 +41,7 @@ namespace TAO PortableServer::Servant s, bool &w) = 0; - virtual bool allow_multiple_activations (void) const = 0; + virtual bool allow_multiple_activations () const = 0; virtual ::PortableServer::IdUniquenessPolicyValue type() const = 0; }; diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp index fde3e6c68e2..170d4a18643 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp +++ b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp @@ -13,7 +13,7 @@ namespace TAO } void - IdUniquenessStrategyMultiple::strategy_cleanup (void) + IdUniquenessStrategyMultiple::strategy_cleanup () { } @@ -28,7 +28,7 @@ namespace TAO } bool - IdUniquenessStrategyMultiple::allow_multiple_activations (void) const + IdUniquenessStrategyMultiple::allow_multiple_activations () const { return true; } diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h index b64983f446b..5b1c7ba96eb 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h @@ -33,13 +33,13 @@ namespace TAO public: virtual void strategy_init (TAO_Root_POA *poa); - virtual void strategy_cleanup (void); + virtual void strategy_cleanup (); virtual bool is_servant_activation_allowed ( PortableServer::Servant servant, bool &w); - virtual bool allow_multiple_activations (void) const; + virtual bool allow_multiple_activations () const; virtual ::PortableServer::IdUniquenessPolicyValue type() const; }; diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp index 89a795db50f..30563653abf 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp @@ -7,7 +7,7 @@ namespace TAO { namespace Portable_Server { - IdUniquenessStrategyUnique::IdUniquenessStrategyUnique (void) : + IdUniquenessStrategyUnique::IdUniquenessStrategyUnique () : poa_ (0) { } @@ -22,7 +22,7 @@ namespace TAO void IdUniquenessStrategyUnique::strategy_cleanup ( - void) + ) { poa_ = 0; } @@ -42,7 +42,7 @@ namespace TAO } bool - IdUniquenessStrategyUnique::allow_multiple_activations (void) const + IdUniquenessStrategyUnique::allow_multiple_activations () const { return false; } diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h index fe25b407ce8..ba910f7dc0f 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h @@ -31,17 +31,17 @@ namespace TAO : public IdUniquenessStrategy { public: - IdUniquenessStrategyUnique (void); + IdUniquenessStrategyUnique (); virtual void strategy_init (TAO_Root_POA *poa); - virtual void strategy_cleanup (void); + virtual void strategy_cleanup (); virtual bool is_servant_activation_allowed ( PortableServer::Servant servant, bool &wait_occurred_restart_call); - virtual bool allow_multiple_activations (void) const; + virtual bool allow_multiple_activations () const; virtual ::PortableServer::IdUniquenessPolicyValue type() const; diff --git a/TAO/tao/PortableServer/ImR_Client_Adapter.cpp b/TAO/tao/PortableServer/ImR_Client_Adapter.cpp index a21645d1b04..359f2b7f26b 100644 --- a/TAO/tao/PortableServer/ImR_Client_Adapter.cpp +++ b/TAO/tao/PortableServer/ImR_Client_Adapter.cpp @@ -6,7 +6,7 @@ namespace TAO { namespace Portable_Server { - ImR_Client_Adapter::~ImR_Client_Adapter (void) + ImR_Client_Adapter::~ImR_Client_Adapter () { } } diff --git a/TAO/tao/PortableServer/ImR_Client_Adapter.h b/TAO/tao/PortableServer/ImR_Client_Adapter.h index b3113da36a9..5f183ef335c 100644 --- a/TAO/tao/PortableServer/ImR_Client_Adapter.h +++ b/TAO/tao/PortableServer/ImR_Client_Adapter.h @@ -52,7 +52,7 @@ namespace TAO public ACE_Service_Object { public: - virtual ~ImR_Client_Adapter (void); + virtual ~ImR_Client_Adapter (); /// ImplRepo helper method, notify the ImplRepo on startup virtual void imr_notify_startup (TAO_Root_POA* poa ) = 0; diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp index a2429e9d9a0..ee97fc016db 100644 --- a/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp @@ -17,7 +17,7 @@ namespace TAO } CORBA::Policy_ptr - ImplicitActivationPolicy::copy (void) + ImplicitActivationPolicy::copy () { ImplicitActivationPolicy *copy = 0; ACE_NEW_THROW_EX (copy, @@ -28,30 +28,30 @@ namespace TAO } void - ImplicitActivationPolicy::destroy (void) + ImplicitActivationPolicy::destroy () { } ::PortableServer::ImplicitActivationPolicyValue - ImplicitActivationPolicy::value (void) + ImplicitActivationPolicy::value () { return value_; } CORBA::PolicyType - ImplicitActivationPolicy::policy_type (void) + ImplicitActivationPolicy::policy_type () { return ::PortableServer::IMPLICIT_ACTIVATION_POLICY_ID; } TAO_Cached_Policy_Type - ImplicitActivationPolicy::_tao_cached_type (void) const + ImplicitActivationPolicy::_tao_cached_type () const { return TAO_CACHED_POLICY_IMPLICIT_ACTIVATION; } TAO_Policy_Scope - ImplicitActivationPolicy::_tao_scope (void) const + ImplicitActivationPolicy::_tao_scope () const { return TAO_POLICY_POA_SCOPE; } diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicy.h b/TAO/tao/PortableServer/ImplicitActivationPolicy.h index 861d6b4645d..9a418378fea 100644 --- a/TAO/tao/PortableServer/ImplicitActivationPolicy.h +++ b/TAO/tao/PortableServer/ImplicitActivationPolicy.h @@ -43,19 +43,19 @@ namespace TAO public: ImplicitActivationPolicy (::PortableServer::ImplicitActivationPolicyValue value); - CORBA::Policy_ptr copy (void); + CORBA::Policy_ptr copy (); - void destroy (void); + void destroy (); - ::PortableServer::ImplicitActivationPolicyValue value (void); + ::PortableServer::ImplicitActivationPolicyValue value (); - CORBA::PolicyType policy_type (void); + CORBA::PolicyType policy_type (); /// Return the cached policy type for this policy. - virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; + virtual TAO_Cached_Policy_Type _tao_cached_type () const; /// Returns the scope at which this policy can be applied. See orbconf.h. - virtual TAO_Policy_Scope _tao_scope (void) const; + virtual TAO_Policy_Scope _tao_scope () const; private: ::PortableServer::ImplicitActivationPolicyValue value_; diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp index 41e8002c1c9..3bc68da0d7e 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp @@ -14,7 +14,7 @@ namespace TAO } void - ImplicitActivationStrategy::strategy_cleanup (void) + ImplicitActivationStrategy::strategy_cleanup () { } } diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategy.h b/TAO/tao/PortableServer/ImplicitActivationStrategy.h index 70f1731d28d..491df8cf702 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategy.h +++ b/TAO/tao/PortableServer/ImplicitActivationStrategy.h @@ -30,9 +30,9 @@ namespace TAO public: virtual void strategy_init(TAO_Root_POA *poa); - virtual void strategy_cleanup(void); + virtual void strategy_cleanup(); - virtual bool allow_implicit_activation (void) const = 0; + virtual bool allow_implicit_activation () const = 0; }; } } diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp index 30859b6a30e..98c308606d8 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp @@ -8,7 +8,7 @@ namespace TAO namespace Portable_Server { bool - ImplicitActivationStrategyExplicit::allow_implicit_activation (void) const + ImplicitActivationStrategyExplicit::allow_implicit_activation () const { return false; } diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h index 19c1dfb44ff..05846df574a 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h @@ -31,7 +31,7 @@ namespace TAO public ImplicitActivationStrategy { public: - virtual bool allow_implicit_activation (void) const; + virtual bool allow_implicit_activation () const; }; } } diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp index 0be943ee21c..989dd133b88 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp @@ -9,7 +9,7 @@ namespace TAO namespace Portable_Server { bool - ImplicitActivationStrategyImplicit::allow_implicit_activation (void) const + ImplicitActivationStrategyImplicit::allow_implicit_activation () const { return true; } diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h index 06d74edcd93..68d0a997130 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h @@ -33,7 +33,7 @@ namespace TAO : public ImplicitActivationStrategy { public: - virtual bool allow_implicit_activation (void) const; + virtual bool allow_implicit_activation () const; }; } } diff --git a/TAO/tao/PortableServer/Key_Adapters.cpp b/TAO/tao/PortableServer/Key_Adapters.cpp index c7ccba1f38c..b48962042fc 100644 --- a/TAO/tao/PortableServer/Key_Adapters.cpp +++ b/TAO/tao/PortableServer/Key_Adapters.cpp @@ -7,7 +7,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Incremental_Key_Generator::TAO_Incremental_Key_Generator (void) +TAO_Incremental_Key_Generator::TAO_Incremental_Key_Generator () : counter_ (0) { } diff --git a/TAO/tao/PortableServer/Key_Adapters.h b/TAO/tao/PortableServer/Key_Adapters.h index 330c219efc8..9bbc42e51ea 100644 --- a/TAO/tao/PortableServer/Key_Adapters.h +++ b/TAO/tao/PortableServer/Key_Adapters.h @@ -40,7 +40,7 @@ class TAO_Incremental_Key_Generator { public: - TAO_Incremental_Key_Generator (void); + TAO_Incremental_Key_Generator (); int operator() (PortableServer::ObjectId &id); diff --git a/TAO/tao/PortableServer/LifespanPolicy.cpp b/TAO/tao/PortableServer/LifespanPolicy.cpp index e9d7a4bcd43..04c9a86b4ce 100644 --- a/TAO/tao/PortableServer/LifespanPolicy.cpp +++ b/TAO/tao/PortableServer/LifespanPolicy.cpp @@ -19,7 +19,7 @@ namespace TAO } CORBA::Policy_ptr - LifespanPolicy::copy (void) + LifespanPolicy::copy () { LifespanPolicy *copy = 0; ACE_NEW_THROW_EX (copy, @@ -30,30 +30,30 @@ namespace TAO } void - LifespanPolicy::destroy (void) + LifespanPolicy::destroy () { } ::PortableServer::LifespanPolicyValue - LifespanPolicy::value (void) + LifespanPolicy::value () { return value_; } CORBA::PolicyType - LifespanPolicy::policy_type (void) + LifespanPolicy::policy_type () { return ::PortableServer::LIFESPAN_POLICY_ID; } TAO_Cached_Policy_Type - LifespanPolicy::_tao_cached_type (void) const + LifespanPolicy::_tao_cached_type () const { return TAO_CACHED_POLICY_LIFESPAN; } TAO_Policy_Scope - LifespanPolicy::_tao_scope (void) const + LifespanPolicy::_tao_scope () const { return TAO_POLICY_POA_SCOPE; } diff --git a/TAO/tao/PortableServer/LifespanPolicy.h b/TAO/tao/PortableServer/LifespanPolicy.h index 0caa634b327..20b90910f9a 100644 --- a/TAO/tao/PortableServer/LifespanPolicy.h +++ b/TAO/tao/PortableServer/LifespanPolicy.h @@ -43,19 +43,19 @@ namespace TAO public: LifespanPolicy (::PortableServer::LifespanPolicyValue value); - CORBA::Policy_ptr copy (void); + CORBA::Policy_ptr copy (); - void destroy (void); + void destroy (); - ::PortableServer::LifespanPolicyValue value (void); + ::PortableServer::LifespanPolicyValue value (); - CORBA::PolicyType policy_type (void); + CORBA::PolicyType policy_type (); /// Return the cached policy type for this policy. - virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; + virtual TAO_Cached_Policy_Type _tao_cached_type () const; /// Returns the scope at which this policy can be applied. See orbconf.h. - virtual TAO_Policy_Scope _tao_scope (void) const; + virtual TAO_Policy_Scope _tao_scope () const; private: ::PortableServer::LifespanPolicyValue value_; diff --git a/TAO/tao/PortableServer/LifespanStrategy.cpp b/TAO/tao/PortableServer/LifespanStrategy.cpp index c87eec3b84e..e331e653adb 100644 --- a/TAO/tao/PortableServer/LifespanStrategy.cpp +++ b/TAO/tao/PortableServer/LifespanStrategy.cpp @@ -26,13 +26,13 @@ namespace TAO } void - LifespanStrategy::strategy_cleanup (void) + LifespanStrategy::strategy_cleanup () { poa_ = 0; } CORBA::ULong - LifespanStrategy::key_type_length (void) const + LifespanStrategy::key_type_length () const { return sizeof (char); } diff --git a/TAO/tao/PortableServer/LifespanStrategy.h b/TAO/tao/PortableServer/LifespanStrategy.h index da64516525c..6aaa52a0bdf 100644 --- a/TAO/tao/PortableServer/LifespanStrategy.h +++ b/TAO/tao/PortableServer/LifespanStrategy.h @@ -33,17 +33,17 @@ namespace TAO : public Policy_Strategy { public: - LifespanStrategy (void); + LifespanStrategy (); virtual void strategy_init (TAO_Root_POA *poa); - virtual void strategy_cleanup (void); + virtual void strategy_cleanup (); void create (const char *name, const TAO::ObjectKey &key); - virtual void notify_startup (void) = 0; + virtual void notify_startup () = 0; - virtual void notify_shutdown (void) = 0; + virtual void notify_shutdown () = 0; /** * Validate the passed object key if it belongs to this POA. @@ -53,12 +53,12 @@ namespace TAO /** * Returns the length of the key type */ - virtual CORBA::ULong key_length (void) const = 0; + virtual CORBA::ULong key_length () const = 0; - CORBA::ULong key_type_length (void) const; + CORBA::ULong key_type_length () const; /// Do we have set persistent or not, - virtual CORBA::Boolean is_persistent (void) const = 0; + virtual CORBA::Boolean is_persistent () const = 0; virtual void create_key (CORBA::Octet *buffer, CORBA::ULong& starting_at) = 0; @@ -68,7 +68,7 @@ namespace TAO const TAO::Portable_Server::Temporary_Creation_Time& creation_time) const = 0; /// Check the state of the POA. - virtual void check_state (void) = 0; + virtual void check_state () = 0; virtual ::PortableServer::LifespanPolicyValue type () const = 0; diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp index c20461a0a74..62f681a6f18 100644 --- a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp @@ -31,13 +31,13 @@ namespace TAO } char - LifespanStrategyPersistent::key_type (void) const + LifespanStrategyPersistent::key_type () const { return 'P'; } CORBA::Boolean - LifespanStrategyPersistent::is_persistent (void) const + LifespanStrategyPersistent::is_persistent () const { return true; } @@ -59,15 +59,14 @@ namespace TAO } void - LifespanStrategyPersistent::notify_startup (void) + LifespanStrategyPersistent::notify_startup () { if (this->use_imr_) { // The user specified that the ImR should be used. ImR_Client_Adapter *adapter = ACE_Dynamic_Service<ImR_Client_Adapter>::instance ( - TAO_Root_POA::imr_client_adapter_name () - ); + TAO_Root_POA::imr_client_adapter_name ()); #if !defined (TAO_AS_STATIC_LIBS) // In case we build shared, try to load the ImR Client library, in a @@ -105,12 +104,11 @@ namespace TAO } void - LifespanStrategyPersistent::notify_shutdown (void) + LifespanStrategyPersistent::notify_shutdown () { ImR_Client_Adapter *adapter = ACE_Dynamic_Service<ImR_Client_Adapter>::instance ( - TAO_Root_POA::imr_client_adapter_name () - ); + TAO_Root_POA::imr_client_adapter_name ()); if (adapter != 0) { @@ -124,7 +122,7 @@ namespace TAO } void - LifespanStrategyPersistent::check_state (void) + LifespanStrategyPersistent::check_state () { this->poa_->tao_poa_manager().check_state (); } @@ -154,8 +152,7 @@ namespace TAO // The user specified that the ImR should be used. ImR_Client_Adapter *adapter = ACE_Dynamic_Service<ImR_Client_Adapter>::instance ( - TAO_Root_POA::imr_client_adapter_name () - ); + TAO_Root_POA::imr_client_adapter_name ()); if (adapter == 0) { // couldn't load adapter, already reported error diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistent.h b/TAO/tao/PortableServer/LifespanStrategyPersistent.h index 62d56f94e17..03d2075f81d 100644 --- a/TAO/tao/PortableServer/LifespanStrategyPersistent.h +++ b/TAO/tao/PortableServer/LifespanStrategyPersistent.h @@ -36,15 +36,15 @@ namespace TAO virtual void strategy_init(TAO_Root_POA *poa); - virtual void notify_startup (void); + virtual void notify_startup (); - virtual void notify_shutdown (void); + virtual void notify_shutdown (); - char key_type (void) const; + char key_type () const; - virtual CORBA::Boolean is_persistent (void) const; + virtual CORBA::Boolean is_persistent () const; - CORBA::ULong key_length (void) const; + CORBA::ULong key_length () const; virtual void create_key (CORBA::Octet *buffer, CORBA::ULong& starting_at); @@ -53,7 +53,7 @@ namespace TAO const TAO::Portable_Server::Temporary_Creation_Time& creation_time) const; /// Check the state of the POA. - virtual void check_state (void); + virtual void check_state (); virtual ::PortableServer::LifespanPolicyValue type() const; diff --git a/TAO/tao/PortableServer/LifespanStrategyTransient.cpp b/TAO/tao/PortableServer/LifespanStrategyTransient.cpp index a701ad0398c..268ea7b3546 100644 --- a/TAO/tao/PortableServer/LifespanStrategyTransient.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyTransient.cpp @@ -19,17 +19,17 @@ namespace TAO } void - LifespanStrategyTransient::notify_startup (void) + LifespanStrategyTransient::notify_startup () { } void - LifespanStrategyTransient::notify_shutdown (void) + LifespanStrategyTransient::notify_shutdown () { } CORBA::Boolean - LifespanStrategyTransient::is_persistent (void) const + LifespanStrategyTransient::is_persistent () const { return false; } @@ -44,7 +44,7 @@ namespace TAO } CORBA::ULong - LifespanStrategyTransient::key_length (void) const + LifespanStrategyTransient::key_length () const { CORBA::ULong keylength = sizeof (char); @@ -77,13 +77,13 @@ namespace TAO } char - LifespanStrategyTransient::key_type (void) const + LifespanStrategyTransient::key_type () const { return 'T'; } void - LifespanStrategyTransient::check_state (void) + LifespanStrategyTransient::check_state () { if (this->poa_->tao_poa_manager ().get_state_i () == PortableServer::POAManager::INACTIVE) diff --git a/TAO/tao/PortableServer/LifespanStrategyTransient.h b/TAO/tao/PortableServer/LifespanStrategyTransient.h index a3ef34c46fa..161994e964a 100644 --- a/TAO/tao/PortableServer/LifespanStrategyTransient.h +++ b/TAO/tao/PortableServer/LifespanStrategyTransient.h @@ -31,17 +31,17 @@ namespace TAO : public LifespanStrategy { public: - LifespanStrategyTransient (void); + LifespanStrategyTransient (); - virtual void notify_startup (void); + virtual void notify_startup (); - virtual void notify_shutdown (void); + virtual void notify_shutdown (); - char key_type (void) const; + char key_type () const; - virtual CORBA::Boolean is_persistent (void) const; + virtual CORBA::Boolean is_persistent () const; - CORBA::ULong key_length (void) const; + CORBA::ULong key_length () const; virtual void create_key (CORBA::Octet *buffer, CORBA::ULong& starting_at); @@ -50,7 +50,7 @@ namespace TAO const TAO::Portable_Server::Temporary_Creation_Time& creation_time) const; /// Check the state of the POA. - virtual void check_state (void); + virtual void check_state (); virtual ::PortableServer::LifespanPolicyValue type() const; diff --git a/TAO/tao/PortableServer/Network_Priority_Hook.cpp b/TAO/tao/PortableServer/Network_Priority_Hook.cpp index b143ac6a441..50efd1ee5af 100644 --- a/TAO/tao/PortableServer/Network_Priority_Hook.cpp +++ b/TAO/tao/PortableServer/Network_Priority_Hook.cpp @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Network_Priority_Hook::~TAO_Network_Priority_Hook(void) +TAO_Network_Priority_Hook::~TAO_Network_Priority_Hook() { } @@ -25,7 +25,7 @@ TAO_Network_Priority_Hook::set_dscp_codepoint ( } int -TAO_Network_Priority_Hook::initialize (void) +TAO_Network_Priority_Hook::initialize () { return ACE_Service_Config::process_directive (ace_svc_desc_TAO_Network_Priority_Hook); diff --git a/TAO/tao/PortableServer/Network_Priority_Hook.h b/TAO/tao/PortableServer/Network_Priority_Hook.h index 756e587e26d..29e4cfb2834 100644 --- a/TAO/tao/PortableServer/Network_Priority_Hook.h +++ b/TAO/tao/PortableServer/Network_Priority_Hook.h @@ -39,7 +39,7 @@ class TAO_PortableServer_Export TAO_Network_Priority_Hook : public ACE_Service_Object { public: - virtual ~TAO_Network_Priority_Hook(void); + virtual ~TAO_Network_Priority_Hook(); virtual void update_network_priority (TAO_Root_POA& poa, TAO_POA_Policy_Set& poa_policy_set); @@ -49,7 +49,7 @@ public: TAO_Root_POA& poa); /// Static initializer ensures the factory is loaded - static int initialize (void); + static int initialize (); }; diff --git a/TAO/tao/PortableServer/Non_Servant_Upcall.cpp b/TAO/tao/PortableServer/Non_Servant_Upcall.cpp index e00befdbd1d..58bb91a3936 100644 --- a/TAO/tao/PortableServer/Non_Servant_Upcall.cpp +++ b/TAO/tao/PortableServer/Non_Servant_Upcall.cpp @@ -43,7 +43,7 @@ namespace TAO this->object_adapter_.lock ().release (); } - Non_Servant_Upcall::~Non_Servant_Upcall (void) + Non_Servant_Upcall::~Non_Servant_Upcall () { // Reacquire the Object Adapter lock. this->object_adapter_.lock ().acquire (); diff --git a/TAO/tao/PortableServer/Non_Servant_Upcall.h b/TAO/tao/PortableServer/Non_Servant_Upcall.h index c05b50db449..75041660593 100644 --- a/TAO/tao/PortableServer/Non_Servant_Upcall.h +++ b/TAO/tao/PortableServer/Non_Servant_Upcall.h @@ -53,9 +53,9 @@ namespace TAO Non_Servant_Upcall (::TAO_Root_POA &poa); /// Destructor. - ~Non_Servant_Upcall (void); + ~Non_Servant_Upcall (); - ::TAO_Root_POA &poa (void) const; + ::TAO_Root_POA &poa () const; protected: diff --git a/TAO/tao/PortableServer/ORT_Adapter.h b/TAO/tao/PortableServer/ORT_Adapter.h index 3e7c6b12e3c..ed4e5f5d052 100644 --- a/TAO/tao/PortableServer/ORT_Adapter.h +++ b/TAO/tao/PortableServer/ORT_Adapter.h @@ -68,11 +68,11 @@ namespace TAO /// Accessor methods to ObjectReferenceTemplate template virtual PortableInterceptor::ObjectReferenceTemplate * - get_adapter_template (void) = 0; + get_adapter_template () = 0; /// Accessor methods to PortableInterceptor::ObjectReferenceFactory virtual PortableInterceptor::ObjectReferenceFactory * - get_obj_ref_factory (void) = 0; + get_obj_ref_factory () = 0; /// Release any references on @c ObjectReferenceTemplate @a t. virtual void release ( diff --git a/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp b/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp index e499d3aa1b0..0411ff7be0b 100644 --- a/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp +++ b/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - ORT_Adapter_Factory::~ORT_Adapter_Factory (void) + ORT_Adapter_Factory::~ORT_Adapter_Factory () { } } diff --git a/TAO/tao/PortableServer/ORT_Adapter_Factory.h b/TAO/tao/PortableServer/ORT_Adapter_Factory.h index 3e018602d4a..d2d1df23f1e 100644 --- a/TAO/tao/PortableServer/ORT_Adapter_Factory.h +++ b/TAO/tao/PortableServer/ORT_Adapter_Factory.h @@ -55,7 +55,7 @@ namespace TAO * line option. Apparently the compiler generated * destructor is inlined. */ - virtual ~ORT_Adapter_Factory (void); + virtual ~ORT_Adapter_Factory (); /// Create a new adapter, in case not possible to allocate, returns 0 virtual TAO::ORT_Adapter * create () = 0; diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp index 00819b064ec..bc65cf1fbc3 100644 --- a/TAO/tao/PortableServer/Object_Adapter.cpp +++ b/TAO/tao/PortableServer/Object_Adapter.cpp @@ -166,11 +166,7 @@ TAO_Object_Adapter::TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Activ No_Hint_Strategy); // Give ownership to the auto pointer. -#if defined (ACE_HAS_CPP11) std::unique_ptr<Hint_Strategy> new_hint_strategy (hint_strategy); -#else - auto_ptr<Hint_Strategy> new_hint_strategy (hint_strategy); -#endif /* ACE_HAS_CPP11 */ new_hint_strategy->object_adapter (this); @@ -197,11 +193,7 @@ TAO_Object_Adapter::TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Activ break; } // Give ownership to the auto pointer. -#if defined (ACE_HAS_CPP11) std::unique_ptr<persistent_poa_name_map> new_persistent_poa_name_map (ppnm); -#else - auto_ptr<persistent_poa_name_map> new_persistent_poa_name_map (ppnm); -#endif /* ACE_HAS_CPP11 */ transient_poa_map *tpm = 0; switch (creation_parameters.poa_lookup_strategy_for_transient_id_policy_) @@ -231,11 +223,7 @@ TAO_Object_Adapter::TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Activ break; } // Give ownership to the auto pointer. -#if defined (ACE_HAS_CPP11) std::unique_ptr<transient_poa_map> new_transient_poa_map (tpm); -#else - auto_ptr<transient_poa_map> new_transient_poa_map (tpm); -#endif /* ACE_HAS_CPP11 */ this->hint_strategy_ = new_hint_strategy.release (); this->persistent_poa_name_map_ = new_persistent_poa_name_map.release (); @@ -292,7 +280,7 @@ TAO_Object_Adapter::init_default_policies (TAO_POA_Policy_Set &policies) #endif } -TAO_Object_Adapter::~TAO_Object_Adapter (void) +TAO_Object_Adapter::~TAO_Object_Adapter () { delete this->hint_strategy_; delete this->persistent_poa_name_map_; @@ -552,7 +540,7 @@ TAO_Object_Adapter::find_servant_i (const TAO::ObjectKey &key, } void -TAO_Object_Adapter::open (void) +TAO_Object_Adapter::open () { // Add in the default POA policies to the default list. this->init_default_policies (this->default_poa_policies ()); @@ -691,7 +679,7 @@ TAO_Object_Adapter::check_close (int wait_for_completion) } int -TAO_Object_Adapter::priority (void) const +TAO_Object_Adapter::priority () const { return 0; } @@ -757,7 +745,7 @@ TAO_Object_Adapter::dispatch (TAO::ObjectKey &key, 0, // nargs 0, // servant_upcall 0, // exceptions - 0); // nexceptions + 0); // nexceptions // If a PortableInterceptor::ForwardRequest exception was // thrown, then set the forward_to object reference and return @@ -786,8 +774,7 @@ TAO_Object_Adapter::dispatch (TAO::ObjectKey &key, 0, // nargs 0, // servant_upcall 0, // exceptions - 0 // nexceptions - ); + 0); // nexceptions } } } @@ -829,13 +816,13 @@ TAO_Object_Adapter::dispatch (TAO::ObjectKey &key, } const char * -TAO_Object_Adapter::name (void) const +TAO_Object_Adapter::name () const { return TAO_OBJID_ROOTPOA; } CORBA::Object_ptr -TAO_Object_Adapter::root (void) +TAO_Object_Adapter::root () { return CORBA::Object::_duplicate (this->root_); } @@ -936,7 +923,7 @@ TAO_Object_Adapter::get_collocated_servant (const TAO_MProfile &mp) // **************************************************************** -TAO_Object_Adapter::Hint_Strategy::~Hint_Strategy (void) +TAO_Object_Adapter::Hint_Strategy::~Hint_Strategy () { } @@ -951,7 +938,7 @@ TAO_Object_Adapter::Active_Hint_Strategy::Active_Hint_Strategy (CORBA::ULong map { } -TAO_Object_Adapter::Active_Hint_Strategy::~Active_Hint_Strategy (void) +TAO_Object_Adapter::Active_Hint_Strategy::~Active_Hint_Strategy () { } @@ -1024,7 +1011,7 @@ TAO_Object_Adapter::Active_Hint_Strategy::unbind_persistent_poa ( return result; } -TAO_Object_Adapter::No_Hint_Strategy::~No_Hint_Strategy (void) +TAO_Object_Adapter::No_Hint_Strategy::~No_Hint_Strategy () { } @@ -1115,7 +1102,7 @@ TAO_Object_Adapter::poa_name_iterator::operator* () const } TAO_Object_Adapter::poa_name_iterator & -TAO_Object_Adapter::poa_name_iterator::operator++ (void) +TAO_Object_Adapter::poa_name_iterator::operator++ () { for (this->last_separator_ = this->position_; ; @@ -1141,7 +1128,7 @@ TAO_Object_Adapter::iteratable_poa_name::iteratable_poa_name ( } TAO_Object_Adapter::iteratable_poa_name::iterator -TAO_Object_Adapter::iteratable_poa_name::begin (void) const +TAO_Object_Adapter::iteratable_poa_name::begin () const { return iterator (1, this->folded_name_.length (), @@ -1149,7 +1136,7 @@ TAO_Object_Adapter::iteratable_poa_name::begin (void) const } TAO_Object_Adapter::iteratable_poa_name::iterator -TAO_Object_Adapter::iteratable_poa_name::end (void) const +TAO_Object_Adapter::iteratable_poa_name::end () const { return iterator (0, this->folded_name_.length (), @@ -1157,7 +1144,7 @@ TAO_Object_Adapter::iteratable_poa_name::end (void) const } void -TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete (void) +TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete () { // Check if a non-servant upcall is in progress. If a non-servant // upcall is in progress, wait for it to complete. Unless of @@ -1174,7 +1161,7 @@ TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete (void) } void -TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete_no_throw (void) +TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete_no_throw () { // Non-exception throwing version. try diff --git a/TAO/tao/PortableServer/Object_Adapter.h b/TAO/tao/PortableServer/Object_Adapter.h index 71d0583c0bc..62415aefec9 100644 --- a/TAO/tao/PortableServer/Object_Adapter.h +++ b/TAO/tao/PortableServer/Object_Adapter.h @@ -85,7 +85,7 @@ public: TAO_ORB_Core &orb_core); /// Destructor. - ~TAO_Object_Adapter (void); + ~TAO_Object_Adapter (); int dispatch_servant (const TAO::ObjectKey &key, TAO_ServerRequest &req, @@ -113,31 +113,31 @@ public: int activate_poa (const poa_name &folded_name, TAO_Root_POA *&poa); - ACE_Lock &lock (void); + ACE_Lock &lock (); - TAO_SYNCH_MUTEX &thread_lock (void); + TAO_SYNCH_MUTEX &thread_lock (); - ACE_Reverse_Lock<ACE_Lock> &reverse_lock (void); + ACE_Reverse_Lock<ACE_Lock> &reverse_lock (); /// Access the root poa. - TAO_Root_POA *root_poa (void) const; + TAO_Root_POA *root_poa () const; /// Access to ORB Core. - TAO_ORB_Core &orb_core (void) const; + TAO_ORB_Core &orb_core () const; /// Wait for non-servant upcalls to complete. - void wait_for_non_servant_upcalls_to_complete (void); + void wait_for_non_servant_upcalls_to_complete (); /// Non-exception throwing version. - void wait_for_non_servant_upcalls_to_complete_no_throw (void); + void wait_for_non_servant_upcalls_to_complete_no_throw (); - static CORBA::ULong transient_poa_name_size (void); + static CORBA::ULong transient_poa_name_size (); /// Return the validator. - TAO_Policy_Validator &validator (void); + TAO_Policy_Validator &validator (); /// Return the set of default policies. - TAO_POA_Policy_Set &default_poa_policies (void); + TAO_POA_Policy_Set &default_poa_policies (); /// Set the servant dispatcher method. Ownership is transferred to /// this Object Adapter. Note: This should only be called @@ -149,15 +149,15 @@ public: // = The TAO_Adapter methods, please check tao/Adapter.h for the // documentation - virtual void open (void); + virtual void open (); virtual void close (int wait_for_completion); virtual void check_close (int wait_for_completion); - virtual int priority (void) const; + virtual int priority () const; virtual int dispatch (TAO::ObjectKey &key, TAO_ServerRequest &request, CORBA::Object_out forward_to); - virtual const char *name (void) const; - virtual CORBA::Object_ptr root (void); + virtual const char *name () const; + virtual CORBA::Object_ptr root (); virtual CORBA::Object_ptr create_collocated_object (TAO_Stub *, const TAO_MProfile &); @@ -176,7 +176,7 @@ protected: void locate_poa (const TAO::ObjectKey &key, PortableServer::ObjectId &id, - TAO_Root_POA *&poa ); + TAO_Root_POA *&poa); int find_transient_poa (const poa_name &system_name, CORBA::Boolean root, @@ -215,7 +215,7 @@ public: { public: - virtual ~Hint_Strategy (void); + virtual ~Hint_Strategy (); virtual int find_persistent_poa (const poa_name &system_name, TAO_Root_POA *&poa) = 0; @@ -249,7 +249,7 @@ public: Active_Hint_Strategy (CORBA::ULong map_size); - virtual ~Active_Hint_Strategy (void); + virtual ~Active_Hint_Strategy (); virtual int find_persistent_poa (const poa_name &system_name, TAO_Root_POA *&poa); @@ -286,7 +286,7 @@ public: { public: - virtual ~No_Hint_Strategy (void); + virtual ~No_Hint_Strategy (); virtual int find_persistent_poa (const poa_name &system_name, TAO_Root_POA *&poa); @@ -403,7 +403,7 @@ public: ACE_CString operator* () const; /// Prefix advance. - poa_name_iterator &operator++ (void); + poa_name_iterator &operator++ (); protected: @@ -426,8 +426,8 @@ public: iteratable_poa_name (const poa_name &folded_name); - iterator begin (void) const; - iterator end (void) const; + iterator begin () const; + iterator end () const; protected: @@ -442,7 +442,7 @@ public: /// Pointer to the non-servant upcall in progress. If no non-servant /// upcall is in progress, this pointer is zero. - TAO::Portable_Server::Non_Servant_Upcall *non_servant_upcall_in_progress (void) const; + TAO::Portable_Server::Non_Servant_Upcall *non_servant_upcall_in_progress () const; private: diff --git a/TAO/tao/PortableServer/Object_SArgument_T.h b/TAO/tao/PortableServer/Object_SArgument_T.h index cad8ead9956..56563f63655 100644 --- a/TAO/tao/PortableServer/Object_SArgument_T.h +++ b/TAO/tao/PortableServer/Object_SArgument_T.h @@ -46,7 +46,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S_ptr arg (void) const; + S_ptr arg () const; private: S_var x_; @@ -64,14 +64,14 @@ namespace TAO class Inout_Object_SArgument_T : public InoutArgument { public: - Inout_Object_SArgument_T (void); + Inout_Object_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S_ptr & arg (void); + S_ptr & arg (); private: S_var x_; @@ -90,13 +90,13 @@ namespace TAO class Out_Object_SArgument_T : public OutArgument { public: - Out_Object_SArgument_T (void); + Out_Object_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S_out arg (void); + S_out arg (); private: S_var x_; @@ -114,13 +114,13 @@ namespace TAO class Ret_Object_SArgument_T : public RetArgument { public: - Ret_Object_SArgument_T (void); + Ret_Object_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S_ptr & arg (void); + S_ptr & arg (); private: S_var x_; diff --git a/TAO/tao/PortableServer/Operation_Table.cpp b/TAO/tao/PortableServer/Operation_Table.cpp index 51d1022d3cb..1caafb83961 100644 --- a/TAO/tao/PortableServer/Operation_Table.cpp +++ b/TAO/tao/PortableServer/Operation_Table.cpp @@ -4,12 +4,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Operation_Table::~TAO_Operation_Table (void) +TAO_Operation_Table::~TAO_Operation_Table () { } /**************************************************************/ -TAO::Operation_Skeletons::Operation_Skeletons (void) +TAO::Operation_Skeletons::Operation_Skeletons () : skel_ptr (0) , thruPOA_skel_ptr (0) , direct_skel_ptr (0) diff --git a/TAO/tao/PortableServer/Operation_Table.h b/TAO/tao/PortableServer/Operation_Table.h index bd3e39f380d..11d78518daa 100644 --- a/TAO/tao/PortableServer/Operation_Table.h +++ b/TAO/tao/PortableServer/Operation_Table.h @@ -79,7 +79,7 @@ namespace TAO */ struct TAO_PortableServer_Export Operation_Skeletons { - Operation_Skeletons (void); + Operation_Skeletons (); /// Remote skeleton pointer TAO_Skeleton skel_ptr; @@ -123,7 +123,7 @@ public: virtual int bind (const char *opname, const TAO::Operation_Skeletons skel_ptr) = 0; - virtual ~TAO_Operation_Table (void); + virtual ~TAO_Operation_Table (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp b/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp index bff7610bab2..a36d050310a 100644 --- a/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp +++ b/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp @@ -26,7 +26,7 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Operation_Table_Timeprobe_Description, TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Binary_Search_OpTable::~TAO_Binary_Search_OpTable (void) +TAO_Binary_Search_OpTable::~TAO_Binary_Search_OpTable () { } diff --git a/TAO/tao/PortableServer/Operation_Table_Binary_Search.h b/TAO/tao/PortableServer/Operation_Table_Binary_Search.h index 87c23bce8ea..fa04e2fd156 100644 --- a/TAO/tao/PortableServer/Operation_Table_Binary_Search.h +++ b/TAO/tao/PortableServer/Operation_Table_Binary_Search.h @@ -40,7 +40,7 @@ class TAO_PortableServer_Export TAO_Binary_Search_OpTable public: /// Do nothing destructor. - virtual ~TAO_Binary_Search_OpTable (void); + virtual ~TAO_Binary_Search_OpTable (); /// See the documentation in the base class for details. virtual int find (const char *opname, diff --git a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp index 5f8f5eda365..95e5d4d8ba3 100644 --- a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp +++ b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp @@ -50,7 +50,7 @@ TAO_Dynamic_Hash_OpTable::TAO_Dynamic_Hash_OpTable ( } } -TAO_Dynamic_Hash_OpTable::~TAO_Dynamic_Hash_OpTable (void) +TAO_Dynamic_Hash_OpTable::~TAO_Dynamic_Hash_OpTable () { // Initialize an iterator. We need to go thru each entry and free // up storage allocated to hold the external ids. In this case, diff --git a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h index 611950d5a64..c2c421691f2 100644 --- a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h +++ b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h @@ -49,7 +49,7 @@ public: ACE_Allocator *alloc); /// Destructor - ~TAO_Dynamic_Hash_OpTable (void); + ~TAO_Dynamic_Hash_OpTable (); /// See the documentation in the base class for details. virtual int bind (const char *opname, diff --git a/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp b/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp index 58505e0f0ca..4baed2dea0a 100644 --- a/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp +++ b/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp @@ -27,7 +27,7 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Operation_Table_Timeprobe_Description, TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Linear_Search_OpTable::~TAO_Linear_Search_OpTable (void) +TAO_Linear_Search_OpTable::~TAO_Linear_Search_OpTable () { } diff --git a/TAO/tao/PortableServer/Operation_Table_Linear_Search.h b/TAO/tao/PortableServer/Operation_Table_Linear_Search.h index 380a76e7503..4fa853eca8b 100644 --- a/TAO/tao/PortableServer/Operation_Table_Linear_Search.h +++ b/TAO/tao/PortableServer/Operation_Table_Linear_Search.h @@ -34,7 +34,7 @@ class TAO_PortableServer_Export TAO_Linear_Search_OpTable { public: /// Destructor. - ~TAO_Linear_Search_OpTable (void); + ~TAO_Linear_Search_OpTable (); /// See the documentation in the base class for details. virtual int find (const char *opname, diff --git a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp index 37f9429bb4d..3156673cb9b 100644 --- a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp +++ b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp @@ -26,7 +26,7 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Operation_Table_Timeprobe_Description, TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Do nothing destructor. -TAO_Perfect_Hash_OpTable::~TAO_Perfect_Hash_OpTable (void) +TAO_Perfect_Hash_OpTable::~TAO_Perfect_Hash_OpTable () { } diff --git a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h index 5365cd0aebf..b89d8f511ea 100644 --- a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h +++ b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h @@ -41,7 +41,7 @@ class TAO_PortableServer_Export TAO_Perfect_Hash_OpTable public: /// Do nothing destructor. - virtual ~TAO_Perfect_Hash_OpTable (void); + virtual ~TAO_Perfect_Hash_OpTable (); /// See the documentation in the base class for details. virtual int find (const char *opname, diff --git a/TAO/tao/PortableServer/POAManager.cpp b/TAO/tao/PortableServer/POAManager.cpp index bd72b717853..f1cdd220590 100644 --- a/TAO/tao/PortableServer/POAManager.cpp +++ b/TAO/tao/PortableServer/POAManager.cpp @@ -39,7 +39,7 @@ TAO_POA_Manager::TAO_POA_Manager ( #endif -TAO_POA_Manager::~TAO_POA_Manager (void) +TAO_POA_Manager::~TAO_POA_Manager () { #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) poa_manager_factory_._remove_ref (); @@ -47,13 +47,13 @@ TAO_POA_Manager::~TAO_POA_Manager (void) } char * -TAO_POA_Manager::get_id (void) +TAO_POA_Manager::get_id () { return CORBA::string_dup (this->id_.in ()); } void -TAO_POA_Manager::activate_i (void) +TAO_POA_Manager::activate_i () { // This operation changes the state of the POA manager to active. If // issued while the POA manager is in the inactive state, the @@ -182,7 +182,6 @@ TAO_POA_Manager::hold_requests_i (CORBA::Boolean wait_for_completion) // requests. Any requests that have been queued but have not // started executing will continue to be queued while in the holding // state. - if (this->state_ == PortableServer::POAManager::INACTIVE) { throw PortableServer::POAManager::AdapterInactive (); @@ -204,7 +203,6 @@ TAO_POA_Manager::hold_requests_i (CORBA::Boolean wait_for_completion) // and the current thread is in an invocation context dispatched by // some POA belonging to the same ORB as this POA the BAD_INV_ORDER // exception is raised and the state is not changed. - if (wait_for_completion) { for (POA_COLLECTION::iterator iterator = this->poa_collection_.begin (); @@ -234,7 +232,6 @@ TAO_POA_Manager::discard_requests_i (CORBA::Boolean wait_for_completion) // have not started executing are discarded. When a request is // discarded, a TRANSIENT system exception is returned to the // client. - if (this->state_ == PortableServer::POAManager::INACTIVE) { throw PortableServer::POAManager::AdapterInactive (); @@ -304,7 +301,7 @@ TAO_POA_Manager::register_poa (TAO_Root_POA *poa) } void -TAO_POA_Manager::check_state (void) +TAO_POA_Manager::check_state () { if (state_ == PortableServer::POAManager::ACTIVE) { @@ -370,7 +367,7 @@ TAO_POA_Manager::check_state (void) } CORBA::ORB_ptr -TAO_POA_Manager::_get_orb (void) +TAO_POA_Manager::_get_orb () { return CORBA::ORB::_duplicate (this->object_adapter_.orb_core ().orb ()); } diff --git a/TAO/tao/PortableServer/POAManager.h b/TAO/tao/PortableServer/POAManager.h index d593c8eba66..a589b63c4d0 100644 --- a/TAO/tao/PortableServer/POAManager.h +++ b/TAO/tao/PortableServer/POAManager.h @@ -59,8 +59,7 @@ class TAO_PortableServer_Export TAO_POA_Manager : friend class TAO_Object_Adapter; public: - - void activate (void); + void activate (); #if (TAO_HAS_MINIMUM_POA == 0) @@ -73,9 +72,9 @@ public: #endif /* TAO_HAS_MINIMUM_POA == 0 */ - PortableServer::POAManager::State get_state (void); + PortableServer::POAManager::State get_state (); - char *get_id (void); + char *get_id (); TAO_POA_Manager (TAO_Object_Adapter &object_adapter, #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) @@ -86,22 +85,21 @@ public: const char * id); #endif - ~TAO_POA_Manager (void); + ~TAO_POA_Manager (); /// Check the state of this POA manager - void check_state (void); + void check_state (); PortableServer::POAManager::State get_state_i (); - virtual CORBA::ORB_ptr _get_orb (void); + virtual CORBA::ORB_ptr _get_orb (); #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - CORBA::PolicyList& get_policies (void); + CORBA::PolicyList& get_policies (); #endif protected: - - void activate_i (void); + void activate_i (); void deactivate_i (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion); @@ -118,14 +116,13 @@ protected: #endif /* TAO_HAS_MINIMUM_POA == 0 */ - ACE_Lock &lock (void); + ACE_Lock &lock (); int remove_poa (TAO_Root_POA *poa); int register_poa (TAO_Root_POA *poa); protected: - PortableServer::POAManager::State state_; ACE_Lock &lock_; @@ -139,22 +136,18 @@ protected: CORBA::String_var id_; #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - TAO_POAManager_Factory& poa_manager_factory_; CORBA::PolicyList policies_; - #endif - private : - /** * Generate an id for this POAManager. * @return A value that uniquely identifies the POAManager within a * given process. * @note: The id_ has the ownership of the memory allocated in this method. */ - char* generate_manager_id (void) const; + char* generate_manager_id () const; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/POAManagerFactory.cpp b/TAO/tao/PortableServer/POAManagerFactory.cpp index bc1b2cb69c7..afd7c87df6a 100644 --- a/TAO/tao/PortableServer/POAManagerFactory.cpp +++ b/TAO/tao/PortableServer/POAManagerFactory.cpp @@ -14,7 +14,7 @@ TAO_POAManager_Factory::TAO_POAManager_Factory (TAO_Object_Adapter &object_adapt { } -TAO_POAManager_Factory::~TAO_POAManager_Factory (void) +TAO_POAManager_Factory::~TAO_POAManager_Factory () { this->remove_all_poamanagers (); } @@ -74,7 +74,7 @@ TAO_POAManager_Factory::create_POAManager ( } ::PortableServer::POAManagerFactory::POAManagerSeq * -TAO_POAManager_Factory::list (void) +TAO_POAManager_Factory::list () { ::PortableServer::POAManagerFactory::POAManagerSeq_var poamanagers; CORBA::ULong number_of_poamanagers = static_cast <CORBA::ULong> @@ -122,7 +122,7 @@ TAO_POAManager_Factory::find (const char * id) } void -TAO_POAManager_Factory::remove_all_poamanagers (void) +TAO_POAManager_Factory::remove_all_poamanagers () { for (POAMANAGERSET::iterator iterator = this->poamanager_set_.begin (); iterator != this->poamanager_set_.end (); diff --git a/TAO/tao/PortableServer/POAManagerFactory.h b/TAO/tao/PortableServer/POAManagerFactory.h index 6335b0838dc..319fffaef87 100644 --- a/TAO/tao/PortableServer/POAManagerFactory.h +++ b/TAO/tao/PortableServer/POAManagerFactory.h @@ -43,17 +43,17 @@ class TAO_PortableServer_Export TAO_POAManager_Factory : public: TAO_POAManager_Factory (TAO_Object_Adapter &object_adapter); - virtual ~TAO_POAManager_Factory (void); + virtual ~TAO_POAManager_Factory (); virtual ::PortableServer::POAManager_ptr create_POAManager ( const char * id, const ::CORBA::PolicyList & policies); - virtual ::PortableServer::POAManagerFactory::POAManagerSeq * list (void); + virtual ::PortableServer::POAManagerFactory::POAManagerSeq * list (); virtual ::PortableServer::POAManager_ptr find (const char * id); - void remove_all_poamanagers (void); + void remove_all_poamanagers (); int remove_poamanager (::PortableServer::POAManager_ptr poamanager); diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.cpp b/TAO/tao/PortableServer/POA_Cached_Policies.cpp index 64b5098bdfe..9660fdfede2 100644 --- a/TAO/tao/PortableServer/POA_Cached_Policies.cpp +++ b/TAO/tao/PortableServer/POA_Cached_Policies.cpp @@ -35,7 +35,7 @@ namespace TAO } - Cached_Policies::~Cached_Policies (void) + Cached_Policies::~Cached_Policies () { } @@ -47,8 +47,7 @@ namespace TAO { CORBA::Policy_var policy = policy_set.get_policy_by_index (i); - this->update_policy (policy.in () - ); + this->update_policy (policy.in ()); } } @@ -59,8 +58,7 @@ namespace TAO #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) ::PortableServer::ThreadPolicy_var thread - = ::PortableServer::ThreadPolicy::_narrow (policy - ); + = ::PortableServer::ThreadPolicy::_narrow (policy); if (!CORBA::is_nil (thread.in ())) { @@ -72,8 +70,7 @@ namespace TAO #if !defined (CORBA_E_MICRO) ::PortableServer::LifespanPolicy_var lifespan - = ::PortableServer::LifespanPolicy::_narrow (policy - ); + = ::PortableServer::LifespanPolicy::_narrow (policy); if (!CORBA::is_nil (lifespan.in ())) { @@ -85,8 +82,7 @@ namespace TAO #if !defined (CORBA_E_MICRO) ::PortableServer::IdUniquenessPolicy_var id_uniqueness - = ::PortableServer::IdUniquenessPolicy::_narrow (policy - ); + = ::PortableServer::IdUniquenessPolicy::_narrow (policy); if (!CORBA::is_nil (id_uniqueness.in ())) { @@ -98,8 +94,7 @@ namespace TAO #if !defined (CORBA_E_MICRO) ::PortableServer::IdAssignmentPolicy_var id_assignment - = ::PortableServer::IdAssignmentPolicy::_narrow (policy - ); + = ::PortableServer::IdAssignmentPolicy::_narrow (policy); if (!CORBA::is_nil (id_assignment.in ())) { @@ -112,8 +107,7 @@ namespace TAO #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) ::PortableServer::ImplicitActivationPolicy_var implicit_activation - = ::PortableServer::ImplicitActivationPolicy::_narrow (policy - ); + = ::PortableServer::ImplicitActivationPolicy::_narrow (policy); if (!CORBA::is_nil (implicit_activation.in ())) { @@ -123,8 +117,7 @@ namespace TAO } ::PortableServer::ServantRetentionPolicy_var servant_retention - = ::PortableServer::ServantRetentionPolicy::_narrow (policy - ); + = ::PortableServer::ServantRetentionPolicy::_narrow (policy); if (!CORBA::is_nil (servant_retention.in ())) { @@ -134,8 +127,7 @@ namespace TAO } ::PortableServer::RequestProcessingPolicy_var request_processing - = ::PortableServer::RequestProcessingPolicy::_narrow (policy - ); + = ::PortableServer::RequestProcessingPolicy::_narrow (policy); if (!CORBA::is_nil (request_processing.in ())) { diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.h b/TAO/tao/PortableServer/POA_Cached_Policies.h index 93e502abd84..491b9833d83 100644 --- a/TAO/tao/PortableServer/POA_Cached_Policies.h +++ b/TAO/tao/PortableServer/POA_Cached_Policies.h @@ -57,40 +57,39 @@ namespace TAO Cached_Policies (); - ~Cached_Policies (void); + ~Cached_Policies (); /// Update the cached policy values. - void update (TAO_POA_Policy_Set &policy_set - ); + void update (TAO_POA_Policy_Set &policy_set); /** * @name Accessor methods to cached values. */ //@{ - ::PortableServer::ThreadPolicyValue thread (void) const; - ::PortableServer::LifespanPolicyValue lifespan (void) const; - ::PortableServer::IdUniquenessPolicyValue id_uniqueness (void) const; - ::PortableServer::IdAssignmentPolicyValue id_assignment (void) const; - ::PortableServer::ImplicitActivationPolicyValue implicit_activation (void) const; - ::PortableServer::ServantRetentionPolicyValue servant_retention (void) const; - ::PortableServer::RequestProcessingPolicyValue request_processing (void) const; - PriorityModel priority_model (void) const; - CORBA::Short server_priority (void) const; + ::PortableServer::ThreadPolicyValue thread () const; + ::PortableServer::LifespanPolicyValue lifespan () const; + ::PortableServer::IdUniquenessPolicyValue id_uniqueness () const; + ::PortableServer::IdAssignmentPolicyValue id_assignment () const; + ::PortableServer::ImplicitActivationPolicyValue implicit_activation () const; + ::PortableServer::ServantRetentionPolicyValue servant_retention () const; + ::PortableServer::RequestProcessingPolicyValue request_processing () const; + PriorityModel priority_model () const; + CORBA::Short server_priority () const; /// Returns the network priority model that was set using a policy /// by the server application. /// - NetworkPriorityModel network_priority_model (void) const; + NetworkPriorityModel network_priority_model () const; /// Returns the request DiffServ codepoint that was set using a policy /// by the server application. /// - CORBA::Long request_diffserv_codepoint (void) const; + CORBA::Long request_diffserv_codepoint () const; /// Returns the reply DiffServ codepoint that was set using a policy /// by the server application. /// - CORBA::Long reply_diffserv_codepoint (void) const; + CORBA::Long reply_diffserv_codepoint () const; /// Caches the network priority model that was set using a policy /// by the server application. @@ -116,8 +115,7 @@ namespace TAO protected: /// Helper method to update a particular policy. - void update_policy (const CORBA::Policy_ptr policy - ); + void update_policy (const CORBA::Policy_ptr policy); ::PortableServer::ThreadPolicyValue thread_; diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.inl b/TAO/tao/PortableServer/POA_Cached_Policies.inl index 4c42ccef173..efa253591b3 100644 --- a/TAO/tao/PortableServer/POA_Cached_Policies.inl +++ b/TAO/tao/PortableServer/POA_Cached_Policies.inl @@ -6,55 +6,55 @@ namespace TAO namespace Portable_Server { ACE_INLINE ::PortableServer::ThreadPolicyValue - Cached_Policies::thread (void) const + Cached_Policies::thread () const { return this->thread_; } ACE_INLINE ::PortableServer::LifespanPolicyValue - Cached_Policies::lifespan (void) const + Cached_Policies::lifespan () const { return this->lifespan_; } ACE_INLINE ::PortableServer::IdUniquenessPolicyValue - Cached_Policies::id_uniqueness (void) const + Cached_Policies::id_uniqueness () const { return this->id_uniqueness_; } ACE_INLINE ::PortableServer::IdAssignmentPolicyValue - Cached_Policies::id_assignment (void) const + Cached_Policies::id_assignment () const { return this->id_assignment_; } ACE_INLINE ::PortableServer::ImplicitActivationPolicyValue - Cached_Policies::implicit_activation (void) const + Cached_Policies::implicit_activation () const { return this->implicit_activation_; } ACE_INLINE ::PortableServer::ServantRetentionPolicyValue - Cached_Policies::servant_retention (void) const + Cached_Policies::servant_retention () const { return this->servant_retention_; } ACE_INLINE ::PortableServer::RequestProcessingPolicyValue - Cached_Policies::request_processing (void) const + Cached_Policies::request_processing () const { return this->request_processing_; } ACE_INLINE Cached_Policies::PriorityModel - Cached_Policies::priority_model (void) const + Cached_Policies::priority_model () const { return this->priority_model_; } ACE_INLINE CORBA::Short - Cached_Policies::server_priority (void) const + Cached_Policies::server_priority () const { return this->server_priority_; } @@ -72,19 +72,19 @@ namespace TAO } ACE_INLINE Cached_Policies::NetworkPriorityModel - Cached_Policies::network_priority_model (void) const + Cached_Policies::network_priority_model () const { return this->network_priority_model_; } ACE_INLINE CORBA::Long - Cached_Policies::request_diffserv_codepoint (void) const + Cached_Policies::request_diffserv_codepoint () const { return this->request_diffserv_codepoint_; } ACE_INLINE CORBA::Long - Cached_Policies::reply_diffserv_codepoint (void) const + Cached_Policies::reply_diffserv_codepoint () const { return this->reply_diffserv_codepoint_; } diff --git a/TAO/tao/PortableServer/POA_Current.cpp b/TAO/tao/PortableServer/POA_Current.cpp index 506f938fb96..cdb6a81c23c 100644 --- a/TAO/tao/PortableServer/POA_Current.cpp +++ b/TAO/tao/PortableServer/POA_Current.cpp @@ -13,7 +13,7 @@ namespace TAO namespace Portable_Server { PortableServer::POA_ptr - POA_Current::get_POA (void) + POA_Current::get_POA () { POA_Current_Impl *impl = this->implementation (); @@ -23,7 +23,7 @@ namespace TAO } PortableServer::ObjectId * - POA_Current::get_object_id (void) + POA_Current::get_object_id () { POA_Current_Impl *impl = this->implementation (); @@ -33,7 +33,7 @@ namespace TAO } PortableServer::Servant - POA_Current::get_servant (void) + POA_Current::get_servant () { POA_Current_Impl *impl = this->implementation (); @@ -43,7 +43,7 @@ namespace TAO } CORBA::Object_ptr - POA_Current::get_reference (void) + POA_Current::get_reference () { POA_Current_Impl *impl = this->implementation (); @@ -53,7 +53,7 @@ namespace TAO } POA_Current_Impl * - POA_Current::implementation (void) + POA_Current::implementation () { return static_cast <POA_Current_Impl *> (TAO_TSS_Resources::instance ()->poa_current_impl_); diff --git a/TAO/tao/PortableServer/POA_Current.h b/TAO/tao/PortableServer/POA_Current.h index 6891761505d..3c014c7ece7 100644 --- a/TAO/tao/PortableServer/POA_Current.h +++ b/TAO/tao/PortableServer/POA_Current.h @@ -40,20 +40,19 @@ namespace TAO , public ::CORBA::LocalObject { public: - /** * Returns the POA on which the current request is being invoked. * Can raise the @c NoContext exception if this function is * not invoked in the context of an upcall. */ - PortableServer::POA_ptr get_POA (void); + PortableServer::POA_ptr get_POA (); /** * Returns the object id of the current request being invoked. Can * raise the @c NoContext exception if this function is not * invoked in the context of an upcall. */ - PortableServer::ObjectId *get_object_id (void); + PortableServer::ObjectId *get_object_id (); /** * This operation returns a locally manufactured reference to the object @@ -64,17 +63,17 @@ namespace TAO * Object::is_equivalent operation to compare the two references may not * necessarily return true. */ - CORBA::Object_ptr get_reference (void); + CORBA::Object_ptr get_reference (); /** * Returns a reference to the servant that hosts the object in whose * context it is called. If called outside the context of the POA * dispatched operation, a NoContext exception is raised */ - PortableServer::Servant get_servant (void); + PortableServer::Servant get_servant (); /// Returns the class that implements this interface. - POA_Current_Impl *implementation (void); + POA_Current_Impl *implementation (); /// Sets the thread-specific pointer to the new POA Current state, /// returning a pointer to the existing POA Current state. diff --git a/TAO/tao/PortableServer/POA_Current_Impl.cpp b/TAO/tao/PortableServer/POA_Current_Impl.cpp index a3d4e509474..22c8c91e7a6 100644 --- a/TAO/tao/PortableServer/POA_Current_Impl.cpp +++ b/TAO/tao/PortableServer/POA_Current_Impl.cpp @@ -15,7 +15,7 @@ namespace TAO { namespace Portable_Server { - POA_Current_Impl::POA_Current_Impl (void) + POA_Current_Impl::POA_Current_Impl () : poa_ (0), object_id_ (TAO_POA_OBJECT_ID_BUF_SIZE, 0, object_id_buf_), object_key_ (0), @@ -46,13 +46,13 @@ namespace TAO } POA_Current_Impl * - POA_Current_Impl::previous (void) const + POA_Current_Impl::previous () const { return this->previous_current_impl_; } void - POA_Current_Impl::teardown (void) + POA_Current_Impl::teardown () { if (this->setup_done_) { @@ -62,13 +62,13 @@ namespace TAO } PortableServer::POA_ptr - POA_Current_Impl::get_POA (void) + POA_Current_Impl::get_POA () { return PortableServer::POA::_duplicate (this->poa_); } PortableServer::ObjectId * - POA_Current_Impl::get_object_id (void) + POA_Current_Impl::get_object_id () { PortableServer::ObjectId *objid = 0; @@ -80,19 +80,19 @@ namespace TAO } CORBA::Object_ptr - POA_Current_Impl::get_reference (void) + POA_Current_Impl::get_reference () { return this->poa_->id_to_reference (this->object_id_); } PortableServer::Servant - POA_Current_Impl::get_servant (void) + POA_Current_Impl::get_servant () { return this->servant_; } TAO_ORB_Core & - POA_Current_Impl::orb_core (void) const + POA_Current_Impl::orb_core () const { return this->poa_->orb_core (); diff --git a/TAO/tao/PortableServer/POA_Current_Impl.h b/TAO/tao/PortableServer/POA_Current_Impl.h index ef33cc178b9..46fd6c8b9dd 100644 --- a/TAO/tao/PortableServer/POA_Current_Impl.h +++ b/TAO/tao/PortableServer/POA_Current_Impl.h @@ -68,41 +68,41 @@ namespace TAO /// Return pointer to the invoking POA. Raises the /// CORBA::NoContext exception. - PortableServer::POA_ptr get_POA (void); + PortableServer::POA_ptr get_POA (); /** * Return pointer to the object id through which this was invoked. * This may be necessary in cases where a <Servant> is serving under * the guise of multiple object ids. */ - PortableServer::ObjectId *get_object_id (void); + PortableServer::ObjectId *get_object_id (); /** * Returns a reference to the servant that hosts the object in whose * context it is called. */ - PortableServer::Servant get_servant (void); + PortableServer::Servant get_servant (); /** * This operation returns a locally manufactured reference to the object * in the context of which it is called. */ - CORBA::Object_ptr get_reference (void); + CORBA::Object_ptr get_reference (); /// Set the POA implementation. void poa (::TAO_Root_POA *); /// Get the POA implemantation - ::TAO_Root_POA *poa (void) const; + ::TAO_Root_POA *poa () const; /// ORB Core for this current. - TAO_ORB_Core &orb_core (void) const; + TAO_ORB_Core &orb_core () const; /// Set the object ID. void object_id (const PortableServer::ObjectId &id); /// Get the object ID. - const PortableServer::ObjectId &object_id (void) const; + const PortableServer::ObjectId &object_id () const; /// Just replace the object id smartly void replace_object_id (const PortableServer::ObjectId &system_id); @@ -111,34 +111,33 @@ namespace TAO void object_key (const TAO::ObjectKey &key); /// Get the object key. - const TAO::ObjectKey &object_key (void) const; + const TAO::ObjectKey &object_key () const; /// Set the servant for the current upcall. void servant (PortableServer::Servant servant); /// Get the servant for the current upcall. - PortableServer::Servant servant (void) const; + PortableServer::Servant servant () const; /// Set the priority for the current upcall. void priority (CORBA::Short priority); /// Get the priority for the current upcall. - CORBA::Short priority (void) const; + CORBA::Short priority () const; /// Convenience constructor combining construction & initialization. - POA_Current_Impl (void); + POA_Current_Impl (); /// Return the previous current implementation. - POA_Current_Impl *previous (void) const; + POA_Current_Impl *previous () const; /// Teardown the current for this request. - void teardown (void); + void teardown (); /// Setup the current. void setup (::TAO_Root_POA *impl, const TAO::ObjectKey &key); private: - // = Hidden because we don't allow these POA_Current_Impl (const POA_Current_Impl &); void operator= (const POA_Current_Impl &); @@ -175,7 +174,6 @@ namespace TAO /// Pointer to tss resources. TAO_TSS_Resources *tss_resources_; - }; } } diff --git a/TAO/tao/PortableServer/POA_Policy_Set.cpp b/TAO/tao/PortableServer/POA_Policy_Set.cpp index 9b0df5c9089..8f155ed5ebc 100644 --- a/TAO/tao/PortableServer/POA_Policy_Set.cpp +++ b/TAO/tao/PortableServer/POA_Policy_Set.cpp @@ -11,7 +11,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_POA_Policy_Set::TAO_POA_Policy_Set (void) +TAO_POA_Policy_Set::TAO_POA_Policy_Set () : impl_ (TAO_POLICY_POA_SCOPE) { } @@ -22,7 +22,7 @@ TAO_POA_Policy_Set::TAO_POA_Policy_Set (const TAO_POA_Policy_Set &rhs) { } -TAO_POA_Policy_Set::~TAO_POA_Policy_Set (void) +TAO_POA_Policy_Set::~TAO_POA_Policy_Set () { } diff --git a/TAO/tao/PortableServer/POA_Policy_Set.h b/TAO/tao/PortableServer/POA_Policy_Set.h index d842c2ccbc2..8cc73b11ebe 100644 --- a/TAO/tao/PortableServer/POA_Policy_Set.h +++ b/TAO/tao/PortableServer/POA_Policy_Set.h @@ -29,19 +29,18 @@ class TAO_Policy_Validator; class TAO_PortableServer_Export TAO_POA_Policy_Set { public: - - TAO_POA_Policy_Set (void); + TAO_POA_Policy_Set (); TAO_POA_Policy_Set (const TAO_POA_Policy_Set &rhs); - ~TAO_POA_Policy_Set (void); + ~TAO_POA_Policy_Set (); /// Returns the policy at the specified index. /// CORBA::Policy::_nil () is returned if the policy doesn't exist CORBA::Policy *get_policy_by_index (CORBA::ULong index); /// Get the number of policies - CORBA::ULong num_policies (void) const; + CORBA::ULong num_policies () const; /// Obtain a single cached policy. CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type); @@ -56,7 +55,7 @@ public: /// Add all of the client exposed policies to the specified list. void add_client_exposed_fixed_policies (CORBA::PolicyList *client_exposed_policies); - TAO_Policy_Set &policies (void); + TAO_Policy_Set &policies (); /// Obtain a single policy. CORBA::Policy_ptr get_policy (CORBA::PolicyType policy); diff --git a/TAO/tao/PortableServer/Policy_Strategy.h b/TAO/tao/PortableServer/Policy_Strategy.h index ec0a774404f..1acd9e71912 100644 --- a/TAO/tao/PortableServer/Policy_Strategy.h +++ b/TAO/tao/PortableServer/Policy_Strategy.h @@ -34,9 +34,9 @@ namespace TAO public: virtual void strategy_init(TAO_Root_POA *poa) = 0; - virtual void strategy_cleanup(void) = 0; + virtual void strategy_cleanup() = 0; - virtual ~Policy_Strategy (void) {}; + virtual ~Policy_Strategy () {}; }; } } diff --git a/TAO/tao/PortableServer/PortableServer.cpp b/TAO/tao/PortableServer/PortableServer.cpp index dc55e7b8e14..42268bcdfec 100644 --- a/TAO/tao/PortableServer/PortableServer.cpp +++ b/TAO/tao/PortableServer/PortableServer.cpp @@ -44,7 +44,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL int -TAO_POA_Initializer::init (void) +TAO_POA_Initializer::init () { ACE_Service_Config::process_directive ( ace_svc_desc_IdAssignmentStrategySystem); diff --git a/TAO/tao/PortableServer/PortableServer.h b/TAO/tao/PortableServer/PortableServer.h index 6e9d1bd5d98..e236d7c607e 100644 --- a/TAO/tao/PortableServer/PortableServer.h +++ b/TAO/tao/PortableServer/PortableServer.h @@ -27,7 +27,7 @@ class TAO_PortableServer_Export TAO_POA_Initializer { public: /// Used to force the initialization of the ORB code. - static int init (void); + static int init (); }; static const int TAO_Requires_POA_Initializer = TAO_POA_Initializer::init (); diff --git a/TAO/tao/PortableServer/Regular_POA.cpp b/TAO/tao/PortableServer/Regular_POA.cpp index fad1bcc1272..d95abb8b3ca 100644 --- a/TAO/tao/PortableServer/Regular_POA.cpp +++ b/TAO/tao/PortableServer/Regular_POA.cpp @@ -30,12 +30,12 @@ TAO_Regular_POA::TAO_Regular_POA (const TAO_Root_POA::String &name, { } -TAO_Regular_POA::~TAO_Regular_POA (void) +TAO_Regular_POA::~TAO_Regular_POA () { } void -TAO_Regular_POA::remove_from_parent_i (void) +TAO_Regular_POA::remove_from_parent_i () { // Remove POA from the parent if (this->parent_ != 0) @@ -49,13 +49,13 @@ TAO_Regular_POA::remove_from_parent_i (void) } CORBA::Boolean -TAO_Regular_POA::root (void) const +TAO_Regular_POA::root () const { return (parent_ == 0); } char -TAO_Regular_POA::root_key_type (void) +TAO_Regular_POA::root_key_type () { if (this->parent_ != 0) { diff --git a/TAO/tao/PortableServer/Regular_POA.h b/TAO/tao/PortableServer/Regular_POA.h index 3ba38c4130e..9da69970431 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 (void); + virtual ~TAO_Regular_POA (); - PortableServer::POA_ptr the_parent (void); + PortableServer::POA_ptr the_parent (); protected: - virtual void remove_from_parent_i (void); + virtual void remove_from_parent_i (); - virtual CORBA::Boolean root (void) const; + virtual CORBA::Boolean root () const; - virtual char root_key_type (void); + virtual char root_key_type (); /// 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/RequestProcessingPolicy.cpp b/TAO/tao/PortableServer/RequestProcessingPolicy.cpp index 8145883a4cc..a180a70a1c6 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicy.cpp +++ b/TAO/tao/PortableServer/RequestProcessingPolicy.cpp @@ -19,7 +19,7 @@ namespace TAO } CORBA::Policy_ptr - RequestProcessingPolicy::copy (void) + RequestProcessingPolicy::copy () { RequestProcessingPolicy *copy = 0; ACE_NEW_THROW_EX (copy, @@ -30,30 +30,30 @@ namespace TAO } void - RequestProcessingPolicy::destroy (void) + RequestProcessingPolicy::destroy () { } ::PortableServer::RequestProcessingPolicyValue - RequestProcessingPolicy::value (void) + RequestProcessingPolicy::value () { return value_; } CORBA::PolicyType - RequestProcessingPolicy::policy_type (void) + RequestProcessingPolicy::policy_type () { return ::PortableServer::REQUEST_PROCESSING_POLICY_ID; } TAO_Cached_Policy_Type - RequestProcessingPolicy::_tao_cached_type (void) const + RequestProcessingPolicy::_tao_cached_type () const { return TAO_CACHED_POLICY_REQUEST_PROCESSING; } TAO_Policy_Scope - RequestProcessingPolicy::_tao_scope (void) const + RequestProcessingPolicy::_tao_scope () const { return TAO_POLICY_POA_SCOPE; } diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.h b/TAO/tao/PortableServer/RequestProcessingPolicy.h index a93afc63ece..3efefae3963 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicy.h +++ b/TAO/tao/PortableServer/RequestProcessingPolicy.h @@ -43,19 +43,19 @@ namespace TAO public: RequestProcessingPolicy (::PortableServer::RequestProcessingPolicyValue value); - CORBA::Policy_ptr copy (void); + CORBA::Policy_ptr copy (); - void destroy (void); + void destroy (); - ::PortableServer::RequestProcessingPolicyValue value (void); + ::PortableServer::RequestProcessingPolicyValue value (); - CORBA::PolicyType policy_type (void); + CORBA::PolicyType policy_type (); /// Return the cached policy type for this policy. - virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; + virtual TAO_Cached_Policy_Type _tao_cached_type () const; /// Returns the scope at which this policy can be applied. See orbconf.h. - virtual TAO_Policy_Scope _tao_scope (void) const; + virtual TAO_Policy_Scope _tao_scope () const; private: ::PortableServer::RequestProcessingPolicyValue value_; diff --git a/TAO/tao/PortableServer/RequestProcessingStrategy.cpp b/TAO/tao/PortableServer/RequestProcessingStrategy.cpp index 7cd378aa737..f564757c699 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategy.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategy.cpp @@ -14,7 +14,7 @@ namespace TAO { namespace Portable_Server { - RequestProcessingStrategy::RequestProcessingStrategy (void) + RequestProcessingStrategy::RequestProcessingStrategy () : poa_ (0) { } @@ -35,7 +35,7 @@ namespace TAO } void - RequestProcessingStrategy::strategy_cleanup(void) + RequestProcessingStrategy::strategy_cleanup() { poa_ = 0; } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategy.h b/TAO/tao/PortableServer/RequestProcessingStrategy.h index 80613323d41..5378d1739a4 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategy.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategy.h @@ -48,7 +48,7 @@ namespace TAO : public Policy_Strategy { public: - RequestProcessingStrategy (void); + RequestProcessingStrategy (); virtual void strategy_init(TAO_Root_POA *poa); @@ -56,18 +56,18 @@ namespace TAO TAO_Root_POA *poa, ::PortableServer::ServantRetentionPolicyValue); - virtual void strategy_cleanup(void); + 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 (void) = 0; + virtual PortableServer::ServantManager_ptr get_servant_manager () = 0; virtual void set_servant_manager ( PortableServer::ServantManager_ptr imgr) = 0; virtual void set_servant (PortableServer::Servant servant) = 0; - virtual PortableServer::Servant get_servant (void) = 0; + virtual PortableServer::Servant get_servant () = 0; #endif /* TAO_HAS_MINIMUM_POA == 0 !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */ diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp index 7827a2189b3..9a77833ffe3 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp @@ -19,7 +19,7 @@ namespace TAO #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::ServantManager_ptr - RequestProcessingStrategyAOMOnly::get_servant_manager (void) + RequestProcessingStrategyAOMOnly::get_servant_manager () { throw PortableServer::POA::WrongPolicy (); } @@ -39,7 +39,7 @@ namespace TAO } PortableServer::Servant - RequestProcessingStrategyAOMOnly::get_servant (void) + RequestProcessingStrategyAOMOnly::get_servant () { throw PortableServer::POA::WrongPolicy (); } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h index 0ef178c71ce..28718985f5f 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h @@ -36,18 +36,18 @@ namespace TAO : public RequestProcessingStrategy { public: - RequestProcessingStrategyAOMOnly (void); + RequestProcessingStrategyAOMOnly (); #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::ServantManager_ptr - get_servant_manager (void); + get_servant_manager (); void set_servant_manager (PortableServer::ServantManager_ptr imgr); void set_servant (PortableServer::Servant servant); - PortableServer::Servant get_servant (void); + PortableServer::Servant get_servant (); #endif /* TAO_HAS_MINIMUM_POA == 0 !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */ diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp index 201a95b1eb2..b8661b7fd00 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp @@ -18,19 +18,19 @@ namespace TAO { namespace Portable_Server { - RequestProcessingStrategyDefaultServant::RequestProcessingStrategyDefaultServant (void) + RequestProcessingStrategyDefaultServant::RequestProcessingStrategyDefaultServant () : default_servant_ (0) { } void - RequestProcessingStrategyDefaultServant::strategy_cleanup(void) + RequestProcessingStrategyDefaultServant::strategy_cleanup() { this->default_servant_ = 0; } PortableServer::ServantManager_ptr - RequestProcessingStrategyDefaultServant::get_servant_manager (void) + RequestProcessingStrategyDefaultServant::get_servant_manager () { throw PortableServer::POA::WrongPolicy (); } @@ -43,7 +43,7 @@ namespace TAO } PortableServer::Servant - RequestProcessingStrategyDefaultServant::get_servant (void) + RequestProcessingStrategyDefaultServant::get_servant () { // This operation returns the default servant associated with the // POA. diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h index 20ed35f5a4f..e0c9f62f970 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h @@ -37,15 +37,15 @@ namespace TAO : public RequestProcessingStrategy { public: - RequestProcessingStrategyDefaultServant (void); + RequestProcessingStrategyDefaultServant (); - virtual void strategy_cleanup(void); + virtual void strategy_cleanup(); - PortableServer::ServantManager_ptr get_servant_manager (void); + PortableServer::ServantManager_ptr get_servant_manager (); void set_servant_manager (PortableServer::ServantManager_ptr imgr); - PortableServer::Servant get_servant (void); + PortableServer::Servant get_servant (); void set_servant (PortableServer::Servant servant); diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp index 52082c26dd2..85cd906d642 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp @@ -17,13 +17,13 @@ namespace TAO { namespace Portable_Server { - RequestProcessingStrategyServantActivator::RequestProcessingStrategyServantActivator (void) : + RequestProcessingStrategyServantActivator::RequestProcessingStrategyServantActivator () : etherealize_objects_ (true) { } void - RequestProcessingStrategyServantActivator::strategy_cleanup (void) + RequestProcessingStrategyServantActivator::strategy_cleanup () { { Non_Servant_Upcall non_servant_upcall (*this->poa_); @@ -36,7 +36,7 @@ namespace TAO } PortableServer::ServantManager_ptr - RequestProcessingStrategyServantActivator::get_servant_manager (void) + RequestProcessingStrategyServantActivator::get_servant_manager () { return PortableServer::ServantManager::_duplicate (this->servant_activator_.in ()); } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h index 6ffe7776b8b..c7675ae80a0 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h @@ -34,11 +34,11 @@ namespace TAO : public RequestProcessingStrategyServantManager { public: - RequestProcessingStrategyServantActivator (void); + RequestProcessingStrategyServantActivator (); - virtual void strategy_cleanup(void); + virtual void strategy_cleanup(); - PortableServer::ServantManager_ptr get_servant_manager (void); + PortableServer::ServantManager_ptr get_servant_manager (); void set_servant_manager (PortableServer::ServantManager_ptr imgr); diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp index e83bd3afe65..01458939b75 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp @@ -17,12 +17,12 @@ namespace TAO { namespace Portable_Server { - RequestProcessingStrategyServantLocator::RequestProcessingStrategyServantLocator (void) + RequestProcessingStrategyServantLocator::RequestProcessingStrategyServantLocator () { } void - RequestProcessingStrategyServantLocator::strategy_cleanup(void) + RequestProcessingStrategyServantLocator::strategy_cleanup() { { Non_Servant_Upcall non_servant_upcall (*this->poa_); @@ -35,7 +35,7 @@ namespace TAO } PortableServer::ServantManager_ptr - RequestProcessingStrategyServantLocator::get_servant_manager (void) + RequestProcessingStrategyServantLocator::get_servant_manager () { return PortableServer::ServantManager::_duplicate (this->servant_locator_.in ()); } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h index f5306029f20..9cff43232f2 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h @@ -34,11 +34,11 @@ namespace TAO : public RequestProcessingStrategyServantManager { public: - RequestProcessingStrategyServantLocator (void); + RequestProcessingStrategyServantLocator (); - virtual void strategy_cleanup(void); + virtual void strategy_cleanup(); - PortableServer::ServantManager_ptr get_servant_manager (void); + PortableServer::ServantManager_ptr get_servant_manager (); void set_servant_manager (PortableServer::ServantManager_ptr imgr); diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp index 73981faf582..6454c9ff55b 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp @@ -14,12 +14,12 @@ namespace TAO { namespace Portable_Server { - RequestProcessingStrategyServantManager::RequestProcessingStrategyServantManager (void) + RequestProcessingStrategyServantManager::RequestProcessingStrategyServantManager () { } PortableServer::Servant - RequestProcessingStrategyServantManager::get_servant (void) + RequestProcessingStrategyServantManager::get_servant () { throw PortableServer::POA::WrongPolicy (); } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h index 8ef06661724..420d9441072 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h @@ -33,9 +33,9 @@ namespace TAO : public RequestProcessingStrategy { public: - RequestProcessingStrategyServantManager (void); + RequestProcessingStrategyServantManager (); - PortableServer::Servant get_servant (void); + PortableServer::Servant get_servant (); void set_servant (PortableServer::Servant servant); diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp index 972d5057fbc..901ff5ca5a9 100644 --- a/TAO/tao/PortableServer/Root_POA.cpp +++ b/TAO/tao/PortableServer/Root_POA.cpp @@ -318,13 +318,13 @@ TAO_Root_POA::TAO_Root_POA (const TAO_Root_POA::String &name, aps_cleanup_guard._retn (); } -TAO_Root_POA::~TAO_Root_POA (void) +TAO_Root_POA::~TAO_Root_POA () { this->poa_manager_._remove_ref(); } void -TAO_Root_POA::complete_destruction_i (void) +TAO_Root_POA::complete_destruction_i () { bool doing_complete_destruction = this->waiting_destruction_ != false; @@ -739,7 +739,7 @@ TAO_Root_POA::servant_to_reference (PortableServer::Servant servant) } PortableServer::POAList * -TAO_Root_POA::the_children (void) +TAO_Root_POA::the_children () { // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (0); @@ -793,7 +793,7 @@ TAO_Root_POA::destroy (CORBA::Boolean etherealize_objects, } void -TAO_Root_POA::remove_from_parent_i (void) +TAO_Root_POA::remove_from_parent_i () { // The root poa has no parent, so this is a noop } @@ -976,7 +976,7 @@ TAO_Root_POA::delete_child (const TAO_Root_POA::String &child) } PortableServer::POAList * -TAO_Root_POA::the_children_i (void) +TAO_Root_POA::the_children_i () { PortableServer::POAList_var children; CORBA::ULong child_current = static_cast <CORBA::ULong> @@ -1000,7 +1000,7 @@ TAO_Root_POA::the_children_i (void) } PortableInterceptor::AdapterName * -TAO_Root_POA::adapter_name_i (void) +TAO_Root_POA::adapter_name_i () { // The adapter name is the sequence of names starting from the // RootPOA to the one whose name is requested. The name of the @@ -1278,7 +1278,7 @@ TAO_Root_POA::deactivate_object_i (const PortableServer::ObjectId &id) } CORBA::Boolean -TAO_Root_POA::is_persistent (void) const +TAO_Root_POA::is_persistent () const { return active_policy_strategies_.lifespan_strategy()->is_persistent (); } @@ -1539,7 +1539,7 @@ TAO_Root_POA::id_to_reference_i (const PortableServer::ObjectId &id, } CORBA::OctetSeq * -TAO_Root_POA::id (void) +TAO_Root_POA::id () { CORBA::OctetSeq *id = 0; ACE_NEW_THROW_EX (id, @@ -1905,13 +1905,13 @@ TAO_Root_POA::parse_ir_object_key (const TAO::ObjectKey &object_key, } TAO_Object_Adapter & -TAO_Root_POA::object_adapter (void) +TAO_Root_POA::object_adapter () { return *this->object_adapter_; } CORBA::Object_ptr -TAO_Root_POA::invoke_key_to_object (void) +TAO_Root_POA::invoke_key_to_object () { PortableServer::ObjectId_var &system_id = *this->key_to_object_params_.system_id_; @@ -2027,11 +2027,7 @@ TAO_Root_POA::key_to_stub_i (const TAO::ObjectKey &key, } // Give ownership to the auto pointer. -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO_Acceptor_Filter> new_filter (filter); -#else - auto_ptr<TAO_Acceptor_Filter> new_filter (filter); -#endif /* ACE_HAS_CPP11 */ TAO_Stub *data = this->create_stub_object ( @@ -2045,7 +2041,7 @@ TAO_Root_POA::key_to_stub_i (const TAO::ObjectKey &key, } void -TAO_Root_POA::establish_components (void) +TAO_Root_POA::establish_components () { TAO_IORInterceptor_Adapter *ior_adapter = this->orb_core_.ior_interceptor_adapter (); @@ -2233,7 +2229,7 @@ TAO_Root_POA::find_servant_priority ( } TAO::ORT_Adapter * -TAO_Root_POA::ORT_adapter_i (void) +TAO_Root_POA::ORT_adapter_i () { if ((this->ort_adapter_factory_) && (this->ort_adapter_ == 0)) { @@ -2272,7 +2268,7 @@ TAO_Root_POA::ORT_adapter_i (void) #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::AdapterActivator_ptr -TAO_Root_POA::the_activator (void) +TAO_Root_POA::the_activator () { // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (PortableServer::AdapterActivator::_nil ()); @@ -2294,7 +2290,7 @@ TAO_Root_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activa #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::ServantManager_ptr -TAO_Root_POA::get_servant_manager (void) +TAO_Root_POA::get_servant_manager () { // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (PortableServer::ServantManager::_nil ()); @@ -2314,14 +2310,14 @@ TAO_Root_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr) } PortableServer::Servant -TAO_Root_POA::get_servant_i (void) +TAO_Root_POA::get_servant_i () { return this->active_policy_strategies_.request_processing_strategy()-> get_servant (); } PortableServer::Servant -TAO_Root_POA::get_servant (void) +TAO_Root_POA::get_servant () { // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (0); @@ -2374,7 +2370,7 @@ TAO_Root_POA::is_servant_activation_allowed (PortableServer::Servant servant, } bool -TAO_Root_POA::has_system_id (void) const +TAO_Root_POA::has_system_id () const { return this->active_policy_strategies_.id_assignment_strategy ()-> has_system_id (); @@ -2402,14 +2398,14 @@ TAO_Root_POA::servant_has_remaining_activations (PortableServer::Servant servant } bool -TAO_Root_POA::allow_implicit_activation (void) const +TAO_Root_POA::allow_implicit_activation () const { return this->active_policy_strategies_.implicit_activation_strategy ()-> allow_implicit_activation (); } bool -TAO_Root_POA::allow_multiple_activations (void) const +TAO_Root_POA::allow_multiple_activations () const { return this->active_policy_strategies_.id_uniqueness_strategy ()-> allow_multiple_activations (); @@ -2425,7 +2421,7 @@ TAO_Root_POA::post_invoke_servant_cleanup( } CORBA::Short -TAO_Root_POA::server_priority (void) const +TAO_Root_POA::server_priority () const { return this->cached_policies_.server_priority (); } @@ -2440,19 +2436,19 @@ TAO_Root_POA::is_servant_active ( } TAO::Portable_Server::Cached_Policies& -TAO_Root_POA::cached_policies (void) +TAO_Root_POA::cached_policies () { return this->cached_policies_; } TAO_Network_Priority_Hook* -TAO_Root_POA::network_priority_hook (void) +TAO_Root_POA::network_priority_hook () { return this->network_priority_hook_; } TAO::Portable_Server::Cached_Policies::PriorityModel -TAO_Root_POA::priority_model (void) const +TAO_Root_POA::priority_model () const { return cached_policies_.priority_model (); } @@ -2483,13 +2479,13 @@ TAO_Root_POA::validate_lifespan ( } CORBA::Boolean -TAO_Root_POA::root (void) const +TAO_Root_POA::root () const { return true; } TAO::ORT_Adapter * -TAO_Root_POA::ORT_adapter (void) +TAO_Root_POA::ORT_adapter () { if (this->ort_adapter_ != 0) return this->ort_adapter_; @@ -2507,7 +2503,7 @@ TAO_Root_POA::ORT_adapter (void) } CORBA::Policy * -TAO_Root_POA::server_protocol (void) +TAO_Root_POA::server_protocol () { return 0; } @@ -2529,7 +2525,7 @@ TAO_Root_POA::Key_To_Object_Params::set (PortableServer::ObjectId_var &system_id } CORBA::ULong -TAO_Root_POA::waiting_servant_deactivation (void) const +TAO_Root_POA::waiting_servant_deactivation () const { return this->active_policy_strategies_.servant_retention_strategy ()-> waiting_servant_deactivation (); @@ -2549,13 +2545,13 @@ TAO_Root_POA::get_policy (CORBA::PolicyType policy) } void -TAO_Root_POA::check_state (void) +TAO_Root_POA::check_state () { this->active_policy_strategies_.lifespan_strategy ()->check_state (); } const char * -TAO_Root_POA::ort_adapter_factory_name (void) +TAO_Root_POA::ort_adapter_factory_name () { return TAO_POA_Static_Resources::instance ()->ort_adapter_factory_name_.c_str(); } @@ -2567,27 +2563,27 @@ TAO_Root_POA::imr_client_adapter_name (const char *name) } const char * -TAO_Root_POA::imr_client_adapter_name (void) +TAO_Root_POA::imr_client_adapter_name () { return TAO_POA_Static_Resources::instance ()->imr_client_adapter_name_.c_str(); } PortableServer::POAManager_ptr -TAO_Root_POA::the_POAManager (void) +TAO_Root_POA::the_POAManager () { return PortableServer::POAManager::_duplicate (&this->poa_manager_); } #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::POAManagerFactory_ptr -TAO_Root_POA::the_POAManagerFactory (void) +TAO_Root_POA::the_POAManagerFactory () { return PortableServer::POAManagerFactory::_duplicate (&this->poa_manager_factory_); } #endif CORBA::ORB_ptr -TAO_Root_POA::_get_orb (void) +TAO_Root_POA::_get_orb () { return CORBA::ORB::_duplicate (this->orb_core_.orb ()); } @@ -2604,14 +2600,14 @@ TAO_POA_Static_Resources* TAO_POA_Static_Resources::initialization_reference_ = TAO_POA_Static_Resources::instance (); void -TAO_POA_Static_Resources::fini (void) +TAO_POA_Static_Resources::fini () { delete TAO_POA_Static_Resources::instance_; TAO_POA_Static_Resources::instance_ = 0; } TAO_POA_Static_Resources* -TAO_POA_Static_Resources::instance (void) +TAO_POA_Static_Resources::instance () { if (TAO_POA_Static_Resources::instance_ == 0) { @@ -2628,7 +2624,7 @@ TAO_POA_Static_Resources::instance (void) return TAO_POA_Static_Resources::instance_; } -TAO_POA_Static_Resources::TAO_POA_Static_Resources (void) +TAO_POA_Static_Resources::TAO_POA_Static_Resources () : ort_adapter_factory_name_ ("ORT_Adapter_Factory"), imr_client_adapter_name_ ("ImR_Client_Adapter") { diff --git a/TAO/tao/PortableServer/Root_POA.h b/TAO/tao/PortableServer/Root_POA.h index 5e1124ae33c..37521aad56c 100644 --- a/TAO/tao/PortableServer/Root_POA.h +++ b/TAO/tao/PortableServer/Root_POA.h @@ -176,22 +176,22 @@ public: #endif /* TAO_HAS_MINIMUM_POA == 0 && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */ - char * the_name (void); + char * the_name (); - PortableServer::POA_ptr the_parent (void); + PortableServer::POA_ptr the_parent (); - PortableServer::POAList *the_children (void); + PortableServer::POAList *the_children (); - PortableServer::POAManager_ptr the_POAManager (void); + PortableServer::POAManager_ptr the_POAManager (); #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - PortableServer::POAManagerFactory_ptr the_POAManagerFactory (void); + PortableServer::POAManagerFactory_ptr the_POAManagerFactory (); #endif /// This method returns the adapter_name as a sequence of strings of /// length one or more or just a fixed name depending on the Object /// Adapter. Added wrt to ORT Spec. - PortableInterceptor::AdapterName *adapter_name (void); + PortableInterceptor::AdapterName *adapter_name (); /// Store the given TaggedComponent for eventual insertion into all /// object reference profiles. @@ -204,15 +204,15 @@ public: IOP::ProfileId profile_id); #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - PortableServer::AdapterActivator_ptr the_activator (void); + PortableServer::AdapterActivator_ptr the_activator (); void the_activator (PortableServer::AdapterActivator_ptr adapter_activator); - PortableServer::ServantManager_ptr get_servant_manager (void); + PortableServer::ServantManager_ptr get_servant_manager (); void set_servant_manager (PortableServer::ServantManager_ptr imgr); - PortableServer::Servant get_servant (void); + PortableServer::Servant get_servant (); void set_servant (PortableServer::Servant servant); #endif /* TAO_HAS_MINIMUM_POA == 0 !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */ @@ -246,10 +246,10 @@ public: CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid); - CORBA::OctetSeq *id (void); + CORBA::OctetSeq *id (); /// Accessor for POA policies. - TAO_POA_Policy_Set &policies (void); + TAO_POA_Policy_Set &policies (); /// Get the set policy of the given type. CORBA::Policy_ptr get_policy (CORBA::PolicyType policy); @@ -268,11 +268,11 @@ public: TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter); - virtual ~TAO_Root_POA (void); + virtual ~TAO_Root_POA (); - static char name_separator (void); + static char name_separator (); - static CORBA::ULong name_separator_length (void); + static CORBA::ULong name_separator_length (); enum { @@ -281,34 +281,34 @@ public: static CORBA::Octet const objectkey_prefix[TAO_OBJECTKEY_PREFIX_SIZE]; - const TAO_Object_Adapter::poa_name &folded_name (void) const; + const TAO_Object_Adapter::poa_name &folded_name () const; - const TAO_Object_Adapter::poa_name &system_name (void) const; + const TAO_Object_Adapter::poa_name &system_name () const; static void check_for_valid_wait_for_completions ( const TAO_ORB_Core &orb_core, CORBA::Boolean wait_for_completion); /// ORB Core for POA. - TAO_ORB_Core &orb_core (void) const; + TAO_ORB_Core &orb_core () const; /// obtain a reference to the cached_profiles - TAO::Portable_Server::Cached_Policies& cached_policies (void); + TAO::Portable_Server::Cached_Policies& cached_policies (); /// obtain a handle to the network priority hooks - TAO_Network_Priority_Hook* network_priority_hook (void); + TAO_Network_Priority_Hook* network_priority_hook (); - TAO::Portable_Server::Cached_Policies::PriorityModel priority_model (void) const; + TAO::Portable_Server::Cached_Policies::PriorityModel priority_model () const; - CORBA::Boolean cleanup_in_progress (void); + CORBA::Boolean cleanup_in_progress (); /// Calls protected static method used when POACurrent is not appropriate. static int parse_ir_object_key (const TAO::ObjectKey &object_key, PortableServer::ObjectId &user_id); - TAO_Object_Adapter &object_adapter (void); + TAO_Object_Adapter &object_adapter (); - ACE_Lock &lock (void); + ACE_Lock &lock (); /// Create the correct stub, properly initialized with the /// attributes and policies attached to the current POA. @@ -321,33 +321,33 @@ public: * The POA can be in one of HOLDING, ACTIVE, DISCARDING, INACTIVE * and NON_EXISTENT states. */ - PortableInterceptor::AdapterState get_adapter_state (void); + PortableInterceptor::AdapterState get_adapter_state (); - virtual void *thread_pool (void) const; + virtual void *thread_pool () const; - virtual CORBA::Policy *server_protocol (void); + virtual CORBA::Policy *server_protocol (); - CORBA::ULong outstanding_requests (void) const; + CORBA::ULong outstanding_requests () const; - const ACE_CString &name (void) const; + const ACE_CString &name () const; - CORBA::Boolean waiting_destruction (void) const; + CORBA::Boolean waiting_destruction () const; static void ort_adapter_factory_name (const char *name); - static const char *ort_adapter_factory_name (void); + static const char *ort_adapter_factory_name (); /// Sets the value of TAO_POA_Static_Resources::imr_client_adapter_name_. static void imr_client_adapter_name (const char *name); /// Gets the value of TAO_POA_Static_Resources::imr_client_adapter_name_. - static const char *imr_client_adapter_name (void); + static const char *imr_client_adapter_name (); - CORBA::Object_ptr invoke_key_to_object (void); + CORBA::Object_ptr invoke_key_to_object (); - CORBA::Boolean system_id (void); + CORBA::Boolean system_id (); - CORBA::ULong waiting_servant_deactivation (void) const; + CORBA::ULong waiting_servant_deactivation () const; /// Return the POA Manager related to this POA TAO_POA_Manager &tao_poa_manager (); @@ -373,9 +373,9 @@ public: CORBA::Boolean servant_has_remaining_activations ( PortableServer::Servant servant); - bool allow_implicit_activation (void) const; + bool allow_implicit_activation () const; - bool allow_multiple_activations (void) const; + bool allow_multiple_activations () const; int is_servant_active ( PortableServer::Servant servant, @@ -383,11 +383,11 @@ public: void deactivate_object_i (const PortableServer::ObjectId &oid); - CORBA::Boolean is_persistent (void) const; + CORBA::Boolean is_persistent () const; - CORBA::Short server_priority (void) const; + CORBA::Short server_priority () const; - bool has_system_id (void) const; + bool has_system_id () const; PortableServer::Servant find_servant (const PortableServer::ObjectId &system_id); @@ -436,18 +436,18 @@ public: PortableServer::ObjectId *servant_to_id_i (PortableServer::Servant servant); - TAO_SYNCH_CONDITION &servant_deactivation_condition (void); + TAO_SYNCH_CONDITION &servant_deactivation_condition (); int is_poa_generated_id (const PortableServer::ObjectId &id); /// Check the state of this POA - void check_state (void); + void check_state (); int delete_child (const String &child); PortableServer::Servant user_id_to_servant_i (const PortableServer::ObjectId &oid); - virtual CORBA::ORB_ptr _get_orb (void); + virtual CORBA::ORB_ptr _get_orb (); /// These hooks are needed by the CSD strategy to override /// and no-ops by default. @@ -469,9 +469,9 @@ public: protected: #if (TAO_HAS_MINIMUM_POA == 0) - int enter (void); + int enter (); - int exit (void); + int exit (); #endif /* TAO_HAS_MINIMUM_POA == 0 */ #if ! defined (CORBA_E_MICRO) @@ -501,14 +501,14 @@ protected: void destroy_i (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion); - void complete_destruction_i (void); + void complete_destruction_i (); - PortableServer::POAList *the_children_i (void); + PortableServer::POAList *the_children_i (); /// This method returns the adapter_name as a sequence of strings of /// length one or more or just a fixed name depending on the Object /// Adapter. Added wrt to ORT Spec. - PortableInterceptor::AdapterName *adapter_name_i (void); + PortableInterceptor::AdapterName *adapter_name_i (); /// Method to notify the IOR Interceptors when there is a state /// changed not related to POAManager. @@ -546,7 +546,7 @@ protected: TAO_Acceptor_Filter *filter, TAO_Acceptor_Registry &acceptor_registry); - PortableServer::Servant get_servant_i (void); + PortableServer::Servant get_servant_i (); protected: void activate_object_with_id_i (const PortableServer::ObjectId &id, @@ -554,7 +554,7 @@ protected: CORBA::Short priority, bool &wait_occurred_restart_call); - virtual void remove_from_parent_i (void); + virtual void remove_from_parent_i (); void deactivate_all_objects_i (CORBA::Boolean etherealize_objects); @@ -585,7 +585,7 @@ protected: * IORInterceptor::components_established() once the former is * completed. */ - void establish_components (void); + void establish_components (); /// Call the IORInterceptor::components_established() method on all /// registered IORInterceptors. @@ -608,13 +608,13 @@ protected: protected: /// Accessor methods to ObjectReferenceTemplate PortableInterceptor::ObjectReferenceTemplate * - get_adapter_template (void); + get_adapter_template (); /// Accessor methods to ObjectReferenceTemplate, non locked version - PortableInterceptor::ObjectReferenceTemplate *get_adapter_template_i (void); + PortableInterceptor::ObjectReferenceTemplate *get_adapter_template_i (); /// Accessor methods to PortableInterceptor::ObjectReferenceFactory - PortableInterceptor::ObjectReferenceFactory *get_obj_ref_factory (void); + PortableInterceptor::ObjectReferenceFactory *get_obj_ref_factory (); /// Set the object reference factory void set_obj_ref_factory ( @@ -640,39 +640,39 @@ protected: /// Get the ORT adapter, in case there is no adapter yet, this method will /// try to create one and hold the POA lock - TAO::ORT_Adapter *ORT_adapter (void); + TAO::ORT_Adapter *ORT_adapter (); /// Get the ORT adapter, in case there is no adapter yet, this method will /// try to create one but assumes the POA lock is already hold - TAO::ORT_Adapter *ORT_adapter_i (void); + TAO::ORT_Adapter *ORT_adapter_i (); - CORBA::Boolean persistent (void); + CORBA::Boolean persistent (); - static char persistent_key_char (void); + static char persistent_key_char (); - static char transient_key_char (void); + static char transient_key_char (); - static CORBA::ULong persistent_key_type_length (void); + static CORBA::ULong persistent_key_type_length (); - static char system_id_key_char (void); + static char system_id_key_char (); - static char user_id_key_char (void); + static char user_id_key_char (); - static CORBA::ULong system_id_key_type_length (void); + static CORBA::ULong system_id_key_type_length (); - virtual CORBA::Boolean root (void) const; + virtual CORBA::Boolean root () const; - virtual char root_key_type (void); + virtual char root_key_type (); - static char root_key_char (void); + static char root_key_char (); - static char non_root_key_char (void); + static char non_root_key_char (); - static CORBA::ULong root_key_type_length (void); + static CORBA::ULong root_key_type_length (); - CORBA::ULong increment_outstanding_requests (void); + CORBA::ULong increment_outstanding_requests (); - CORBA::ULong decrement_outstanding_requests (void); + CORBA::ULong decrement_outstanding_requests (); String name_; @@ -797,10 +797,10 @@ class TAO_PortableServer_Export TAO_POA_Static_Resources public: /// Return the singleton instance. - static TAO_POA_Static_Resources* instance (void); + static TAO_POA_Static_Resources* instance (); /// Cleanup the static singleton - static void fini (void) ACE_GCC_DESTRUCTOR_ATTRIBUTE; + static void fini () ACE_GCC_DESTRUCTOR_ATTRIBUTE; public: @@ -823,7 +823,7 @@ public: ACE_CString imr_client_adapter_name_; private: /// Constructor. - TAO_POA_Static_Resources (void); + TAO_POA_Static_Resources (); private: /// The singleton instance. diff --git a/TAO/tao/PortableServer/SUpcall_commands.cpp b/TAO/tao/PortableServer/SUpcall_commands.cpp index 6ccba4791cb..bcda45a6750 100644 --- a/TAO/tao/PortableServer/SUpcall_commands.cpp +++ b/TAO/tao/PortableServer/SUpcall_commands.cpp @@ -16,7 +16,7 @@ #include "tao/Object.h" void -_is_a_thru_poa_Upcall_Command::execute (void) +_is_a_thru_poa_Upcall_Command::execute () { TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> ( @@ -35,7 +35,7 @@ _is_a_thru_poa_Upcall_Command::execute (void) } void -_is_a_Upcall_Command::execute (void) +_is_a_Upcall_Command::execute () { TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = static_cast<TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val *> (this->args_[0])->arg (); @@ -50,7 +50,7 @@ _is_a_Upcall_Command::execute (void) #if (TAO_HAS_MINIMUM_CORBA == 0) void -_non_existent_thru_poa_Upcall_Command::execute (void) +_non_existent_thru_poa_Upcall_Command::execute () { TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> ( @@ -62,7 +62,7 @@ _non_existent_thru_poa_Upcall_Command::execute (void) } void -_non_existent_Upcall_Command::execute (void) +_non_existent_Upcall_Command::execute () { TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = static_cast<TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val *> (this->args_[0])->arg (); @@ -74,7 +74,7 @@ _non_existent_Upcall_Command::execute (void) # if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) void -_get_component_thru_poa_Upcall_Command::execute (void) +_get_component_thru_poa_Upcall_Command::execute () { TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval = TAO::Portable_Server::get_ret_arg< ::CORBA::Object> ( @@ -86,7 +86,7 @@ _get_component_thru_poa_Upcall_Command::execute (void) } void -_get_component_Upcall_Command::execute (void) +_get_component_Upcall_Command::execute () { TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval = static_cast<TAO::SArg_Traits< ::CORBA::Object>::ret_val *> (this->args_[0])->arg (); @@ -99,7 +99,7 @@ _get_component_Upcall_Command::execute (void) void -_repository_id_thru_poa_Upcall_Command::execute (void) +_repository_id_thru_poa_Upcall_Command::execute () { TAO::SArg_Traits< char *>::ret_arg_type retval = TAO::Portable_Server::get_ret_arg< char *> ( @@ -111,7 +111,7 @@ _repository_id_thru_poa_Upcall_Command::execute (void) } void -_repository_id_Upcall_Command::execute(void ) +_repository_id_Upcall_Command::execute( ) { TAO::SArg_Traits< char *>::ret_arg_type retval = static_cast<TAO::SArg_Traits< char *>::ret_val *> (this->args_[0])->arg (); diff --git a/TAO/tao/PortableServer/SUpcall_commands.h b/TAO/tao/PortableServer/SUpcall_commands.h index d68ee481d18..e7ed10c074b 100644 --- a/TAO/tao/PortableServer/SUpcall_commands.h +++ b/TAO/tao/PortableServer/SUpcall_commands.h @@ -52,7 +52,7 @@ public: , args_ (args) {} - virtual void execute (void); + virtual void execute (); private: TAO_ServantBase * const servant_; @@ -77,7 +77,7 @@ public: { } - virtual void execute (void); + virtual void execute (); private: TAO_ServantBase * const servant_; @@ -105,7 +105,7 @@ public: { } - virtual void execute (void); + virtual void execute (); private: TAO_ServantBase * const servant_; TAO_Operation_Details const * const operation_details_; @@ -129,7 +129,7 @@ public: { } - virtual void execute (void); + virtual void execute (); private: TAO_ServantBase * const servant_; @@ -157,7 +157,7 @@ public: { } - virtual void execute (void); + virtual void execute (); private: TAO_ServantBase * const servant_; @@ -182,7 +182,7 @@ public: { } - virtual void execute (void); + virtual void execute (); private: TAO_ServantBase * const servant_; @@ -209,7 +209,7 @@ public: { } - virtual void execute (void); + virtual void execute (); private: TAO_ServantBase * const servant_; @@ -234,7 +234,7 @@ public: { } - virtual void execute (void); + virtual void execute (); private: TAO_ServantBase * const servant_; diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.cpp b/TAO/tao/PortableServer/ServantRetentionPolicy.cpp index c716959b96f..6c7eb85a171 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicy.cpp +++ b/TAO/tao/PortableServer/ServantRetentionPolicy.cpp @@ -18,7 +18,7 @@ namespace TAO } CORBA::Policy_ptr - ServantRetentionPolicy::copy (void) + ServantRetentionPolicy::copy () { ServantRetentionPolicy *copy = 0; ACE_NEW_THROW_EX (copy, @@ -29,30 +29,30 @@ namespace TAO } void - ServantRetentionPolicy::destroy (void) + ServantRetentionPolicy::destroy () { } ::PortableServer::ServantRetentionPolicyValue - ServantRetentionPolicy::value (void) + ServantRetentionPolicy::value () { return this->value_; } CORBA::PolicyType - ServantRetentionPolicy::policy_type (void) + ServantRetentionPolicy::policy_type () { return ::PortableServer::SERVANT_RETENTION_POLICY_ID; } TAO_Cached_Policy_Type - ServantRetentionPolicy::_tao_cached_type (void) const + ServantRetentionPolicy::_tao_cached_type () const { return TAO_CACHED_POLICY_SERVANT_RETENTION; } TAO_Policy_Scope - ServantRetentionPolicy::_tao_scope (void) const + ServantRetentionPolicy::_tao_scope () const { return TAO_POLICY_POA_SCOPE; } diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.h b/TAO/tao/PortableServer/ServantRetentionPolicy.h index d62c550b224..b39152dad1c 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicy.h +++ b/TAO/tao/PortableServer/ServantRetentionPolicy.h @@ -43,19 +43,19 @@ namespace TAO public: ServantRetentionPolicy (::PortableServer::ServantRetentionPolicyValue value); - CORBA::Policy_ptr copy (void); + CORBA::Policy_ptr copy (); - void destroy (void); + void destroy (); - ::PortableServer::ServantRetentionPolicyValue value (void); + ::PortableServer::ServantRetentionPolicyValue value (); - CORBA::PolicyType policy_type (void); + CORBA::PolicyType policy_type (); /// Return the cached policy type for this policy. - TAO_Cached_Policy_Type _tao_cached_type (void) const; + TAO_Cached_Policy_Type _tao_cached_type () const; /// Returns the scope at which this policy can be applied. See orbconf.h. - TAO_Policy_Scope _tao_scope (void) const; + TAO_Policy_Scope _tao_scope () const; private: ::PortableServer::ServantRetentionPolicyValue value_; diff --git a/TAO/tao/PortableServer/ServantRetentionStrategy.h b/TAO/tao/PortableServer/ServantRetentionStrategy.h index 436eb6a185d..eb54dc6520a 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategy.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategy.h @@ -37,7 +37,7 @@ namespace TAO : public Policy_Strategy { public: - virtual CORBA::ULong waiting_servant_deactivation (void) const = 0; + virtual CORBA::ULong waiting_servant_deactivation () const = 0; virtual int is_servant_in_map (PortableServer::Servant servant, bool &wait_occurred_restart_call) = 0; @@ -81,7 +81,7 @@ namespace TAO const PortableServer::ObjectId &id, bool indirect) = 0; - virtual void deactivate_all_objects (void) = 0; + virtual void deactivate_all_objects () = 0; virtual PortableServer::ObjectId *servant_to_user_id ( PortableServer::Servant servant) = 0; diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp index 2ace6f13b39..e4e39fbe4bd 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp @@ -24,7 +24,7 @@ namespace TAO { namespace Portable_Server { - ServantRetentionStrategyNonRetain::ServantRetentionStrategyNonRetain (void) : + ServantRetentionStrategyNonRetain::ServantRetentionStrategyNonRetain () : poa_ (0), sys_id_count_ (0) { @@ -37,7 +37,7 @@ namespace TAO } void - ServantRetentionStrategyNonRetain::strategy_cleanup (void) + ServantRetentionStrategyNonRetain::strategy_cleanup () { poa_ = 0; } @@ -129,13 +129,13 @@ namespace TAO } CORBA::ULong - ServantRetentionStrategyNonRetain::waiting_servant_deactivation (void) const + ServantRetentionStrategyNonRetain::waiting_servant_deactivation () const { return 0; } void - ServantRetentionStrategyNonRetain::deactivate_all_objects (void) + ServantRetentionStrategyNonRetain::deactivate_all_objects () { } diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h index 837e0868b5a..8d2e46f5336 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h @@ -19,7 +19,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/PortableServer/Servant_Location.h" -#include "ace/Atomic_Op.h" +#include <atomic> TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -33,13 +33,13 @@ namespace TAO : public ServantRetentionStrategy { public: - ServantRetentionStrategyNonRetain (void); + ServantRetentionStrategyNonRetain (); virtual void strategy_init (TAO_Root_POA *poa); - virtual void strategy_cleanup(void); + virtual void strategy_cleanup(); - CORBA::ULong waiting_servant_deactivation (void) const; + CORBA::ULong waiting_servant_deactivation () const; virtual PortableServer::ObjectId * @@ -86,7 +86,7 @@ namespace TAO const PortableServer::ObjectId &system_id, CORBA::Short &priority); - virtual void deactivate_all_objects (void); + virtual void deactivate_all_objects (); virtual PortableServer::ObjectId *servant_to_user_id ( PortableServer::Servant servant); @@ -123,7 +123,7 @@ namespace TAO protected: TAO_Root_POA *poa_; - ACE_Atomic_Op<TAO_SYNCH_MUTEX,ACE_UINT32> sys_id_count_; + std::atomic<uint32_t> sys_id_count_; }; } } diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp index 8c5d451f874..b92e56025cc 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp @@ -26,7 +26,7 @@ namespace TAO { namespace Portable_Server { - ServantRetentionStrategyRetain::ServantRetentionStrategyRetain (void) : + ServantRetentionStrategyRetain::ServantRetentionStrategyRetain () : ServantRetentionStrategyNonRetain (), active_object_map_ (), waiting_servant_deactivation_ (0) @@ -61,7 +61,7 @@ namespace TAO } void - ServantRetentionStrategyRetain::strategy_cleanup (void) + ServantRetentionStrategyRetain::strategy_cleanup () { } @@ -433,13 +433,13 @@ namespace TAO } CORBA::ULong - ServantRetentionStrategyRetain::waiting_servant_deactivation (void) const + ServantRetentionStrategyRetain::waiting_servant_deactivation () const { return waiting_servant_deactivation_; } void - ServantRetentionStrategyRetain::deactivate_all_objects (void) + ServantRetentionStrategyRetain::deactivate_all_objects () { // If the etherealize_objects parameter is TRUE, the POA has the // RETAIN policy, and a servant manager is registered with the POA, @@ -963,7 +963,7 @@ namespace TAO ::PortableServer::ServantRetentionPolicyValue - ServantRetentionStrategyRetain::type(void) const + ServantRetentionStrategyRetain::type() const { return ::PortableServer::RETAIN; } diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h index 500629cf1c0..a475bdb69ac 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h @@ -32,13 +32,13 @@ namespace TAO : public ServantRetentionStrategyNonRetain { public: - ServantRetentionStrategyRetain (void); + ServantRetentionStrategyRetain (); - CORBA::ULong waiting_servant_deactivation (void) const; + CORBA::ULong waiting_servant_deactivation () const; virtual void strategy_init (TAO_Root_POA *poa); - virtual void strategy_cleanup(void); + virtual void strategy_cleanup(); virtual int is_servant_in_map (PortableServer::Servant servant, bool &wait_occurred_restart_call); @@ -85,7 +85,7 @@ namespace TAO const PortableServer::ObjectId &system_id, CORBA::Short &priority); - virtual void deactivate_all_objects (void); + virtual void deactivate_all_objects (); virtual PortableServer::ObjectId *servant_to_user_id ( PortableServer::Servant servant); @@ -139,11 +139,7 @@ namespace TAO TAO_Active_Object_Map * get_active_object_map() const; private: -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO_Active_Object_Map> active_object_map_; -#else - auto_ptr<TAO_Active_Object_Map> active_object_map_; -#endif /* ACE_HAS_CPP11 */ CORBA::ULong waiting_servant_deactivation_; }; } diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp index 2824458e957..531be3b10f4 100644 --- a/TAO/tao/PortableServer/Servant_Base.cpp +++ b/TAO/tao/PortableServer/Servant_Base.cpp @@ -29,8 +29,6 @@ #include "ace/Dynamic_Service.h" #include "ace/OS_NS_string.h" -//@@ TAO_SERVANT_BASE_INCLUDE_ADD_HOOK - #if !defined (__ACE_INLINE__) # include "tao/PortableServer/Servant_Base.inl" #endif /* ! __ACE_INLINE__ */ @@ -81,12 +79,12 @@ TAO_ServantBase::operator= (const TAO_ServantBase &rhs) return *this; } -TAO_ServantBase::~TAO_ServantBase (void) +TAO_ServantBase::~TAO_ServantBase () { } PortableServer::POA_ptr -TAO_ServantBase::_default_POA (void) +TAO_ServantBase::_default_POA () { CORBA::Object_var object = TAO_ORB_Core_instance ()->root_poa (); @@ -436,13 +434,13 @@ TAO_ServantBase::_is_a (const char *logical_type_id) #if (TAO_HAS_MINIMUM_CORBA == 0) CORBA::Boolean -TAO_ServantBase::_non_existent (void) +TAO_ServantBase::_non_existent () { return false; } CORBA::InterfaceDef_ptr -TAO_ServantBase::_get_interface (void) +TAO_ServantBase::_get_interface () { TAO_IFR_Client_Adapter *adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( @@ -461,13 +459,13 @@ TAO_ServantBase::_get_interface (void) #if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) CORBA::Object_ptr -TAO_ServantBase::_get_component (void) +TAO_ServantBase::_get_component () { return CORBA::Object::_nil (); } #endif char * -TAO_ServantBase::_repository_id (void) +TAO_ServantBase::_repository_id () { return CORBA::string_dup (this->_interface_repository_id ()); } @@ -495,7 +493,7 @@ TAO_ServantBase::_find (const char *opname, } TAO_Stub * -TAO_ServantBase::_create_stub (void) +TAO_ServantBase::_create_stub () { TAO_Stub *stub = 0; @@ -569,12 +567,6 @@ TAO_ServantBase::synchronous_upcall_dispatch ( // case. skel (req, servant_upcall, derived_this); - /* - * Dispatch resolution specialization add hook. - * Over-ridden with code to handle optimized dispatch. - */ - //@@ TAO_DISPATCH_RESOLUTION_OPT_ADD_HOOK - // It is our job to send the already marshaled reply, but only // send if it is expected and it has not already been sent @@ -653,13 +645,13 @@ TAO_ServantBase::asynchronous_upcall_dispatch ( } void -TAO_ServantBase::_add_ref (void) +TAO_ServantBase::_add_ref () { ++this->ref_count_; } void -TAO_ServantBase::_remove_ref (void) +TAO_ServantBase::_remove_ref () { CORBA::ULong const new_count = --this->ref_count_; @@ -670,13 +662,9 @@ TAO_ServantBase::_remove_ref (void) } CORBA::ULong -TAO_ServantBase::_refcount_value (void) const +TAO_ServantBase::_refcount_value () const { -#if defined (ACE_HAS_CPP11) return this->ref_count_; -#else - return this->ref_count_.value (); -#endif /* ACE_HAS_CPP11 */ } void diff --git a/TAO/tao/PortableServer/Servant_Base.h b/TAO/tao/PortableServer/Servant_Base.h index b37018662db..9b15c1c26bb 100644 --- a/TAO/tao/PortableServer/Servant_Base.h +++ b/TAO/tao/PortableServer/Servant_Base.h @@ -22,11 +22,7 @@ #include "tao/PortableServer/PS_ForwardC.h" #include "tao/PortableServer/Servant_var.h" #include "tao/Abstract_Servant_Base.h" -#if defined (ACE_HAS_CPP11) #include <atomic> -#else -#include "ace/Atomic_Op.h" -#endif /* ACE_HAS_CPP11 */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -69,7 +65,7 @@ public: typedef CORBA::Object_var _stub_var_type; /// Destructor. - virtual ~TAO_ServantBase (void); + virtual ~TAO_ServantBase (); static void _is_a_skel (TAO_ServerRequest & req, TAO::Portable_Server::Servant_Upcall* servant_upcall, @@ -108,29 +104,29 @@ public: #endif /* TAO_HAS_MINIMUM_CORBA */ /// Returns the default POA for this servant. - virtual PortableServer::POA_ptr _default_POA (void); + virtual PortableServer::POA_ptr _default_POA (); /// Local implementation of the CORBA::Object::_is_a method. virtual CORBA::Boolean _is_a (const char *logical_type_id); #if (TAO_HAS_MINIMUM_CORBA == 0) /// Default _non_existent: always returns false. - virtual CORBA::Boolean _non_existent (void); + virtual CORBA::Boolean _non_existent (); /// Query the Interface Repository for the interface definition. - virtual CORBA::InterfaceDef_ptr _get_interface (void); + virtual CORBA::InterfaceDef_ptr _get_interface (); #if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) /// Default _get_component: always returns CORBA::Object::_nil(). - virtual CORBA::Object_ptr _get_component (void); + virtual CORBA::Object_ptr _get_component (); #endif /// Get the repository id. - virtual char * _repository_id (void); + virtual char * _repository_id (); #endif /* TAO_HAS_MINIMUM_CORBA */ /// This is an auxiliary method for _this() and _narrow(). - virtual TAO_Stub *_create_stub (void); + virtual TAO_Stub *_create_stub (); /** * Dispatches a request to the object: find the operation, cast the @@ -155,26 +151,26 @@ public: const size_t length = 0); /// Get this interface's repository id (TAO specific). - virtual const char *_interface_repository_id (void) const = 0; + virtual const char *_interface_repository_id () const = 0; //@{ /** * @name Reference Counting Operations */ /// Increase reference count by one. - virtual void _add_ref (void); + virtual void _add_ref (); /** * Decreases reference count by one; if the resulting reference * count equals zero, _remove_ref invokes delete on its this pointer * in order to destroy the servant. */ - virtual void _remove_ref (void); + virtual void _remove_ref (); /** * Returns the current reference count value. */ - virtual CORBA::ULong _refcount_value (void) const; + virtual CORBA::ULong _refcount_value () const; //@} virtual void _collocated_dispatch (::CORBA::Object_ptr obj, @@ -187,7 +183,6 @@ public: TAO::Collocation_Strategy strategy); protected: - /// Default constructor, only derived classes can be created. explicit TAO_ServantBase (TAO_Operation_Table* optable = 0); @@ -209,11 +204,7 @@ protected: protected: /// Reference counter. -#if defined (ACE_HAS_CPP11) std::atomic<uint32_t> ref_count_; -#else - ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> ref_count_; -#endif /* ACE_HAS_CPP11 */ /// The operation table for this servant. It is initialized by the /// most derived class. diff --git a/TAO/tao/PortableServer/Servant_Dispatcher.cpp b/TAO/tao/PortableServer/Servant_Dispatcher.cpp index fe0524cd9d1..722af63e3c9 100644 --- a/TAO/tao/PortableServer/Servant_Dispatcher.cpp +++ b/TAO/tao/PortableServer/Servant_Dispatcher.cpp @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Servant_Dispatcher::~TAO_Servant_Dispatcher (void) +TAO_Servant_Dispatcher::~TAO_Servant_Dispatcher () { } diff --git a/TAO/tao/PortableServer/Servant_Dispatcher.h b/TAO/tao/PortableServer/Servant_Dispatcher.h index bf48fea7dc4..ced50eec720 100644 --- a/TAO/tao/PortableServer/Servant_Dispatcher.h +++ b/TAO/tao/PortableServer/Servant_Dispatcher.h @@ -48,7 +48,7 @@ namespace PortableServer class TAO_PortableServer_Export TAO_Servant_Dispatcher { public: - virtual ~TAO_Servant_Dispatcher (void); + virtual ~TAO_Servant_Dispatcher (); /// Pre_invoke remote request. virtual void pre_invoke_remote_request ( diff --git a/TAO/tao/PortableServer/Servant_Upcall.cpp b/TAO/tao/PortableServer/Servant_Upcall.cpp index e08ac1ae707..e77ac5fb31a 100644 --- a/TAO/tao/PortableServer/Servant_Upcall.cpp +++ b/TAO/tao/PortableServer/Servant_Upcall.cpp @@ -179,7 +179,7 @@ namespace TAO } void - Servant_Upcall::pre_invoke_collocated_request (void) + Servant_Upcall::pre_invoke_collocated_request () { this->object_adapter_->servant_dispatcher_->pre_invoke_collocated_request ( this->poa (), @@ -188,14 +188,14 @@ namespace TAO } void - Servant_Upcall::post_invoke (void) + Servant_Upcall::post_invoke () { this->object_adapter_->servant_dispatcher_->post_invoke ( this->poa (), this->pre_invoke_state_); } - Servant_Upcall::Pre_Invoke_State::Pre_Invoke_State (void) + Servant_Upcall::Pre_Invoke_State::Pre_Invoke_State () : state_ (NO_ACTION_REQUIRED), original_native_priority_ (0), original_CORBA_priority_ (0) @@ -225,13 +225,13 @@ namespace TAO return this->poa_; } - Servant_Upcall::~Servant_Upcall (void) + Servant_Upcall::~Servant_Upcall () { this->upcall_cleanup (); } void - Servant_Upcall::upcall_cleanup (void) + Servant_Upcall::upcall_cleanup () { this->post_invoke (); @@ -292,14 +292,14 @@ namespace TAO } void - Servant_Upcall::post_invoke_servant_cleanup (void) + Servant_Upcall::post_invoke_servant_cleanup () { this->poa_->post_invoke_servant_cleanup (this->current_context_.object_id (), *this); } void - Servant_Upcall::single_threaded_poa_setup (void) + Servant_Upcall::single_threaded_poa_setup () { #if (TAO_HAS_MINIMUM_POA == 0) // Serialize servants (if necessary). @@ -317,7 +317,7 @@ namespace TAO } void - Servant_Upcall::single_threaded_poa_cleanup (void) + Servant_Upcall::single_threaded_poa_cleanup () { #if (TAO_HAS_MINIMUM_POA == 0) // Since the servant lock was acquired, we must release it. @@ -328,7 +328,7 @@ namespace TAO } void - Servant_Upcall::increment_servant_refcount (void) + Servant_Upcall::increment_servant_refcount () { // Cleanup servant related stuff. if (this->active_object_map_entry_ != 0) @@ -336,7 +336,7 @@ namespace TAO } void - Servant_Upcall::servant_cleanup (void) + Servant_Upcall::servant_cleanup () { // Cleanup servant related stuff. if (this->active_object_map_entry_ != 0) @@ -369,7 +369,7 @@ namespace TAO } void - Servant_Upcall::poa_cleanup (void) + Servant_Upcall::poa_cleanup () { // Decrease <poa->outstanding_requests_> now that the upcall // is complete. diff --git a/TAO/tao/PortableServer/Servant_Upcall.h b/TAO/tao/PortableServer/Servant_Upcall.h index a7f5f2ae320..319a6074389 100644 --- a/TAO/tao/PortableServer/Servant_Upcall.h +++ b/TAO/tao/PortableServer/Servant_Upcall.h @@ -70,7 +70,7 @@ namespace TAO { public: /// Constructor. - Pre_Invoke_State (void); + Pre_Invoke_State (); enum State { @@ -93,7 +93,7 @@ namespace TAO explicit Servant_Upcall (TAO_ORB_Core *orb_core); /// Destructor. - ~Servant_Upcall (void); + ~Servant_Upcall (); /// Locate POA and servant. int prepare_for_upcall (const TAO::ObjectKey &key, @@ -110,41 +110,41 @@ namespace TAO void pre_invoke_remote_request (TAO_ServerRequest &req); /// Run pre_invoke for a collocated request. - void pre_invoke_collocated_request (void); + void pre_invoke_collocated_request (); /// Run post_invoke for a request. - void post_invoke (void); + void post_invoke (); /// Locate POA. ::TAO_Root_POA *lookup_POA (const TAO::ObjectKey &key); /// POA accessor. - ::TAO_Root_POA &poa (void) const; + ::TAO_Root_POA &poa () const; /// Object Adapter accessor. - TAO_Object_Adapter &object_adapter (void) const; + TAO_Object_Adapter &object_adapter () const; /// System ID accessor. - const PortableServer::ObjectId &id (void) const; + const PortableServer::ObjectId &id () const; /// User ID accessors. This is the same value returned by /// PortableServer::Current::get_object_id(). void user_id (const PortableServer::ObjectId *); - const PortableServer::ObjectId &user_id (void) const; + const PortableServer::ObjectId &user_id () const; /// Servant accessor. - PortableServer::Servant servant (void) const; + PortableServer::Servant servant () const; #if (TAO_HAS_MINIMUM_POA == 0) /// Get the Servant Locator's cookie - void* locator_cookie (void) const; + void* locator_cookie () const; /// Set the Servant Locator's cookie void locator_cookie (void* cookie); /// Get the operation name. - const char *operation (void) const; + const char *operation () const; /// Set the operation name. void operation (const char *); @@ -155,10 +155,10 @@ namespace TAO void active_object_map_entry (TAO_Active_Object_Map_Entry *entry); /// Get the active_object_map_entry. - TAO_Active_Object_Map_Entry *active_object_map_entry (void) const; + TAO_Active_Object_Map_Entry *active_object_map_entry () const; /// Get the priority for the current upcall. - CORBA::Short priority (void) const; + CORBA::Short priority () const; enum State { @@ -170,24 +170,24 @@ namespace TAO }; /// Get the state. - State state (void) const; + State state () const; /// Set the state. void state (State); /// Increment the refcount - void increment_servant_refcount (void); + void increment_servant_refcount (); protected: - void post_invoke_servant_cleanup (void); - void single_threaded_poa_setup (void); - void single_threaded_poa_cleanup (void); - void servant_cleanup (void); - void poa_cleanup (void); + void post_invoke_servant_cleanup (); + void single_threaded_poa_setup (); + void single_threaded_poa_cleanup (); + void servant_cleanup (); + void poa_cleanup (); /// Clean-up / reset state of this Servant_Upcall object. - void upcall_cleanup (void); + void upcall_cleanup (); protected: diff --git a/TAO/tao/PortableServer/Servant_var.h b/TAO/tao/PortableServer/Servant_var.h index 1c146dc0eb9..24f66407de2 100644 --- a/TAO/tao/PortableServer/Servant_var.h +++ b/TAO/tao/PortableServer/Servant_var.h @@ -55,7 +55,7 @@ namespace PortableServer /** * This destructor doesn't throw exceptions. */ - ~Servant_var (void); + ~Servant_var (); /// Assignment operator. Assumes ownership of @c p. Servant_var<T> & operator= (T * p); diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.h b/TAO/tao/PortableServer/Special_Basic_SArgument_T.h index 710cf1f494f..3e217820af9 100644 --- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.h +++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.h @@ -38,13 +38,13 @@ namespace TAO class In_Special_Basic_SArgument_T : public InArgument { public: - In_Special_Basic_SArgument_T (void); + In_Special_Basic_SArgument_T (); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S const & arg (void) const; + S const & arg () const; private: S x_; @@ -63,14 +63,14 @@ namespace TAO class Inout_Special_Basic_SArgument_T : public InoutArgument { public: - Inout_Special_Basic_SArgument_T (void); + Inout_Special_Basic_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S & arg (void); + S & arg (); private: S x_; @@ -89,13 +89,13 @@ namespace TAO class Out_Special_Basic_SArgument_T : public OutArgument { public: - Out_Special_Basic_SArgument_T (void); + Out_Special_Basic_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S & arg (void); + S & arg (); private: S x_; @@ -114,13 +114,13 @@ namespace TAO class Ret_Special_Basic_SArgument_T : public RetArgument { public: - Ret_Special_Basic_SArgument_T (void); + Ret_Special_Basic_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S & arg (void); + S & arg (); private: S x_; diff --git a/TAO/tao/PortableServer/StrategyFactory.cpp b/TAO/tao/PortableServer/StrategyFactory.cpp index dc03abc1ed4..575067c77bf 100644 --- a/TAO/tao/PortableServer/StrategyFactory.cpp +++ b/TAO/tao/PortableServer/StrategyFactory.cpp @@ -8,7 +8,7 @@ namespace TAO { namespace Portable_Server { - StrategyFactory::~StrategyFactory (void) + StrategyFactory::~StrategyFactory () { } } /* namespace Portable_Server */ diff --git a/TAO/tao/PortableServer/StrategyFactory.h b/TAO/tao/PortableServer/StrategyFactory.h index fac77d9bff8..ac0b08687ae 100644 --- a/TAO/tao/PortableServer/StrategyFactory.h +++ b/TAO/tao/PortableServer/StrategyFactory.h @@ -31,7 +31,7 @@ namespace TAO : public ACE_Service_Object { public: - virtual ~StrategyFactory (void); + virtual ~StrategyFactory (); }; } /* namespace Portable_Server */ } /* namespace TAO */ diff --git a/TAO/tao/PortableServer/ThreadPolicy.cpp b/TAO/tao/PortableServer/ThreadPolicy.cpp index c7f2869db2b..38dbb7e1f15 100644 --- a/TAO/tao/PortableServer/ThreadPolicy.cpp +++ b/TAO/tao/PortableServer/ThreadPolicy.cpp @@ -18,7 +18,7 @@ namespace TAO } CORBA::Policy_ptr - ThreadPolicy::copy (void) + ThreadPolicy::copy () { ThreadPolicy *copy = 0; ACE_NEW_THROW_EX (copy, @@ -29,30 +29,30 @@ namespace TAO } void - ThreadPolicy::destroy (void) + ThreadPolicy::destroy () { } ::PortableServer::ThreadPolicyValue - ThreadPolicy::value (void) + ThreadPolicy::value () { return value_; } CORBA::PolicyType - ThreadPolicy::policy_type (void) + ThreadPolicy::policy_type () { return ::PortableServer::THREAD_POLICY_ID; } TAO_Cached_Policy_Type - ThreadPolicy::_tao_cached_type (void) const + ThreadPolicy::_tao_cached_type () const { return TAO_CACHED_POLICY_THREAD; } TAO_Policy_Scope - ThreadPolicy::_tao_scope (void) const + ThreadPolicy::_tao_scope () const { return TAO_POLICY_POA_SCOPE; } diff --git a/TAO/tao/PortableServer/ThreadPolicy.h b/TAO/tao/PortableServer/ThreadPolicy.h index 9de46c892bd..e48bee84d72 100644 --- a/TAO/tao/PortableServer/ThreadPolicy.h +++ b/TAO/tao/PortableServer/ThreadPolicy.h @@ -43,19 +43,19 @@ namespace TAO public: ThreadPolicy (::PortableServer::ThreadPolicyValue value); - CORBA::Policy_ptr copy (void); + CORBA::Policy_ptr copy (); - void destroy (void); + void destroy (); - ::PortableServer::ThreadPolicyValue value (void); + ::PortableServer::ThreadPolicyValue value (); - CORBA::PolicyType policy_type (void); + CORBA::PolicyType policy_type (); /// Return the cached policy type for this policy. - TAO_Cached_Policy_Type _tao_cached_type (void) const; + TAO_Cached_Policy_Type _tao_cached_type () const; /// Returns the scope at which this policy can be applied. See orbconf.h. - TAO_Policy_Scope _tao_scope (void) const; + TAO_Policy_Scope _tao_scope () const; private: ::PortableServer::ThreadPolicyValue value_; diff --git a/TAO/tao/PortableServer/ThreadStrategy.cpp b/TAO/tao/PortableServer/ThreadStrategy.cpp index 7b36ab1a869..647081f0660 100644 --- a/TAO/tao/PortableServer/ThreadStrategy.cpp +++ b/TAO/tao/PortableServer/ThreadStrategy.cpp @@ -12,7 +12,7 @@ namespace TAO } void - ThreadStrategy::strategy_cleanup (void) + ThreadStrategy::strategy_cleanup () { } } diff --git a/TAO/tao/PortableServer/ThreadStrategy.h b/TAO/tao/PortableServer/ThreadStrategy.h index 29b9ab8bafa..14488287a2b 100644 --- a/TAO/tao/PortableServer/ThreadStrategy.h +++ b/TAO/tao/PortableServer/ThreadStrategy.h @@ -37,7 +37,7 @@ namespace TAO virtual void strategy_init (TAO_Root_POA *poa); - virtual void strategy_cleanup(void); + virtual void strategy_cleanup(); virtual ::PortableServer::ThreadPolicyValue type() const = 0; }; diff --git a/TAO/tao/PortableServer/ThreadStrategySingle.h b/TAO/tao/PortableServer/ThreadStrategySingle.h index 5b6dea30625..6d3b9bdbac0 100644 --- a/TAO/tao/PortableServer/ThreadStrategySingle.h +++ b/TAO/tao/PortableServer/ThreadStrategySingle.h @@ -30,7 +30,6 @@ #include "ace/Recursive_Thread_Mutex.h" #include "ace/Null_Mutex.h" - #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/UB_String_SArgument_T.h b/TAO/tao/PortableServer/UB_String_SArgument_T.h index 8e19dc77413..457e761bf06 100644 --- a/TAO/tao/PortableServer/UB_String_SArgument_T.h +++ b/TAO/tao/PortableServer/UB_String_SArgument_T.h @@ -33,13 +33,13 @@ namespace TAO class In_UB_String_SArgument_T : public InArgument { public: - In_UB_String_SArgument_T (void); + In_UB_String_SArgument_T (); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S const * arg (void) const; + S const * arg () const; private: S_var x_; @@ -55,14 +55,14 @@ namespace TAO class Inout_UB_String_SArgument_T : public InoutArgument { public: - Inout_UB_String_SArgument_T (void); + Inout_UB_String_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S *& arg (void); + S *& arg (); private: S_var x_; @@ -78,13 +78,13 @@ namespace TAO class Out_UB_String_SArgument_T : public OutArgument { public: - Out_UB_String_SArgument_T (void); + Out_UB_String_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S *& arg (void); + S *& arg (); private: S_var x_; @@ -100,13 +100,13 @@ namespace TAO class Ret_UB_String_SArgument_T : public RetArgument { public: - Ret_UB_String_SArgument_T (void); + Ret_UB_String_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S *& arg (void); + S *& arg (); private: S_var x_; diff --git a/TAO/tao/PortableServer/Upcall_Command.cpp b/TAO/tao/PortableServer/Upcall_Command.cpp index 52dc05020e2..b1133c9f623 100644 --- a/TAO/tao/PortableServer/Upcall_Command.cpp +++ b/TAO/tao/PortableServer/Upcall_Command.cpp @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO::Upcall_Command::~Upcall_Command (void) +TAO::Upcall_Command::~Upcall_Command () { } diff --git a/TAO/tao/PortableServer/Upcall_Command.h b/TAO/tao/PortableServer/Upcall_Command.h index 6184aa987dd..2b32a23d33e 100644 --- a/TAO/tao/PortableServer/Upcall_Command.h +++ b/TAO/tao/PortableServer/Upcall_Command.h @@ -41,10 +41,10 @@ namespace TAO { public: /// Destructor. - virtual ~Upcall_Command (void); + virtual ~Upcall_Command (); /// Execute the upcall. - virtual void execute (void) = 0; + virtual void execute () = 0; }; } // End namespace TAO diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.h b/TAO/tao/PortableServer/Var_Array_SArgument_T.h index 4e15f8aadf1..0242a21f24a 100644 --- a/TAO/tao/PortableServer/Var_Array_SArgument_T.h +++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.h @@ -35,13 +35,13 @@ namespace TAO { public: - In_Var_Array_SArgument_T (void); + In_Var_Array_SArgument_T (); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - typename S_forany::_slice_type const * arg (void) const; + typename S_forany::_slice_type const * arg () const; private: mutable typename S_forany::_array_type x_; @@ -58,14 +58,14 @@ namespace TAO class Inout_Var_Array_SArgument_T : public InoutArgument { public: - Inout_Var_Array_SArgument_T (void); + Inout_Var_Array_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - typename S_forany::_slice_type * arg (void); + typename S_forany::_slice_type * arg (); private: typename S_forany::_array_type x_; @@ -83,13 +83,13 @@ namespace TAO class Out_Var_Array_SArgument_T : public OutArgument { public: - Out_Var_Array_SArgument_T (void); + Out_Var_Array_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - typename S_forany::_slice_type *& arg (void); + typename S_forany::_slice_type *& arg (); private: S_var x_; @@ -107,13 +107,13 @@ namespace TAO class Ret_Var_Array_SArgument_T : public RetArgument { public: - Ret_Var_Array_SArgument_T (void); + Ret_Var_Array_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - typename S_forany::_slice_type *& arg (void); + typename S_forany::_slice_type *& arg (); private: S_var x_; diff --git a/TAO/tao/PortableServer/Var_Size_SArgument_T.h b/TAO/tao/PortableServer/Var_Size_SArgument_T.h index a353331aa48..07773260e03 100644 --- a/TAO/tao/PortableServer/Var_Size_SArgument_T.h +++ b/TAO/tao/PortableServer/Var_Size_SArgument_T.h @@ -38,7 +38,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S const & arg (void) const; + S const & arg () const; private: S x_; @@ -55,14 +55,14 @@ namespace TAO class Inout_Var_Size_SArgument_T : public InoutArgument { public: - Inout_Var_Size_SArgument_T (void); + Inout_Var_Size_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S & arg (void); + S & arg (); private: S x_; @@ -79,13 +79,13 @@ namespace TAO class Out_Var_Size_SArgument_T : public OutArgument { public: - Out_Var_Size_SArgument_T (void); + Out_Var_Size_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S *& arg (void); + S *& arg (); private: typename S::_var_type x_; @@ -102,13 +102,13 @@ namespace TAO class Ret_Var_Size_SArgument_T : public RetArgument { public: - Ret_Var_Size_SArgument_T (void); + Ret_Var_Size_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S *& arg (void); + S *& arg (); private: typename S::_var_type x_; diff --git a/TAO/tao/Principal.cpp b/TAO/tao/Principal.cpp index c7934c3238b..a8710e3b283 100644 --- a/TAO/tao/Principal.cpp +++ b/TAO/tao/Principal.cpp @@ -11,19 +11,19 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -CORBA::Principal::Principal (void) +CORBA::Principal::Principal () : refcount_ (1) { } -CORBA::Principal::~Principal (void) +CORBA::Principal::~Principal () { } CORBA::Boolean operator<< (TAO_OutputCDR & cdr, CORBA::Principal * x) { - if (x != 0) + if (x != nullptr) { CORBA::ULong length = x->id.length (); cdr.write_long (length); @@ -45,7 +45,7 @@ operator>> (TAO_InputCDR & cdr, CORBA::Principal *& x) if (length == 0 || !cdr.good_bit ()) { - x = 0; + x = nullptr; } else { diff --git a/TAO/tao/Principal.h b/TAO/tao/Principal.h index e961e8b419a..756aac6a9a6 100644 --- a/TAO/tao/Principal.h +++ b/TAO/tao/Principal.h @@ -25,11 +25,7 @@ #include "tao/OctetSeqC.h" #include "tao/Pseudo_VarOut_T.h" #include "ace/Thread_Mutex.h" -#if defined (ACE_HAS_CPP11) -# include <atomic> -#else -# include "ace/Atomic_Op.h" -#endif /* ACE_HAS_CPP11 */ +#include <atomic> TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -94,11 +90,7 @@ namespace CORBA private: /// Reference counter. -#if defined (ACE_HAS_CPP11) std::atomic<uint32_t> refcount_; -#else - ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; -#endif /* ACE_HAS_CPP11 */ }; } // End CORBA namespace diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp index 2c332b8fb03..00b5370e7c6 100644 --- a/TAO/tao/Profile.cpp +++ b/TAO/tao/Profile.cpp @@ -27,11 +27,11 @@ TAO_Profile::TAO_Profile (CORBA::ULong tag, : version_ (version) , are_policies_parsed_ (false) , addressing_mode_ (0) - , tagged_profile_ (0) - , ref_object_key_ (0) + , tagged_profile_ (nullptr) + , ref_object_key_ (nullptr) , tag_ (tag) , orb_core_ (orb_core) - , forward_to_ (0) + , forward_to_ (nullptr) , refcount_ (1) , tagged_profile_lock_ () , tagged_profile_created_ (false) @@ -46,18 +46,18 @@ TAO_Profile::TAO_Profile (CORBA::ULong tag, : version_ (version) , are_policies_parsed_ (false) , addressing_mode_ (0) - , tagged_profile_ (0) - , ref_object_key_ (0) + , tagged_profile_ (nullptr) + , ref_object_key_ (nullptr) , tag_ (tag) , orb_core_ (orb_core) - , forward_to_ (0) + , forward_to_ (nullptr) , refcount_ (1) , tagged_profile_lock_ () , tagged_profile_created_ (false) { } -TAO_Profile::~TAO_Profile (void) +TAO_Profile::~TAO_Profile () { if (this->tagged_profile_) { @@ -65,8 +65,6 @@ TAO_Profile::~TAO_Profile (void) } this->orb_core_->object_key_table ().unbind (this->ref_object_key_); - - //@@ TAO_PROFILE_SPL_DESTRUCTOR_ADD_HOOK } void @@ -88,21 +86,21 @@ TAO_Profile::add_tagged_component (const IOP::TaggedComponent &component) TAO_Endpoint * -TAO_Profile::base_endpoint (void) +TAO_Profile::base_endpoint () { return this->endpoint(); } TAO::ObjectKey * -TAO_Profile::_key (void) const +TAO_Profile::_key () const { - TAO::ObjectKey *key = 0; + TAO::ObjectKey *key = nullptr; if (this->ref_object_key_) { ACE_NEW_RETURN (key, TAO::ObjectKey (this->ref_object_key_->object_key ()), - 0); + nullptr); } return key; } @@ -234,7 +232,7 @@ TAO_Profile::decode (TAO_InputCDR& cdr) } IOP::TaggedProfile * -TAO_Profile::create_tagged_profile (void) +TAO_Profile::create_tagged_profile () { if (this->tagged_profile_created_) return this->tagged_profile_; @@ -249,7 +247,7 @@ TAO_Profile::create_tagged_profile (void) { ACE_NEW_RETURN (this->tagged_profile_, IOP::TaggedProfile, - 0); + nullptr); // As we have not created we will now create the TaggedProfile this->tagged_profile_->tag = this->tag_; @@ -305,7 +303,7 @@ TAO_Profile::set_tagged_components (TAO_OutputCDR &out_cdr) CORBA::Octet *buf = tagged_component.component_data.get_buffer (); for (const ACE_Message_Block *iterator = out_cdr.begin (); - iterator != 0; + iterator != nullptr; iterator = iterator->cont ()) { size_t const i_length = iterator->length (); @@ -323,7 +321,7 @@ TAO_Profile::set_tagged_components (TAO_OutputCDR &out_cdr) void TAO_Profile::policies (CORBA::PolicyList *policy_list) { - if (policy_list == 0) + if (policy_list == nullptr) { if (TAO_debug_level) { @@ -338,7 +336,7 @@ TAO_Profile::policies (CORBA::PolicyList *policy_list) Messaging::PolicyValueSeq policy_value_seq; size_t length = 0; - CORBA::Octet *buf = 0; + CORBA::Octet *buf = nullptr; // This loop iterates through CORBA::PolicyList to convert // each CORBA::Policy into a CORBA::PolicyValue @@ -365,7 +363,7 @@ TAO_Profile::policies (CORBA::PolicyList *policy_list) // Copy the CDR buffer data into the octet sequence buffer. for (const ACE_Message_Block *iterator = out_CDR.begin (); - iterator != 0; + iterator != nullptr; iterator = iterator->cont ()) { ACE_OS::memcpy (buf, iterator->rd_ptr (), iterator->length ()); @@ -392,7 +390,7 @@ TAO_Profile::policies (CORBA::PolicyList *policy_list) buf = tagged_component.component_data.get_buffer (); for (const ACE_Message_Block *iterator = out_cdr.begin (); - iterator != 0; + iterator != nullptr; iterator = iterator->cont ()) { size_t const i_length = iterator->length (); @@ -514,7 +512,7 @@ TAO_Profile::get_policies (CORBA::PolicyList& pl) } void -TAO_Profile::verify_orb_configuration (void) +TAO_Profile::verify_orb_configuration () { // If the ORB isn't configured to support tagged components, then // throw an exception. @@ -547,7 +545,7 @@ TAO_Profile::verify_orb_configuration (void) } void -TAO_Profile::verify_profile_version (void) +TAO_Profile::verify_profile_version () { // GIOP 1.0 does not support tagged components. Throw an exception // if the profile is a GIOP 1.0 profile. @@ -578,14 +576,14 @@ TAO_Profile::verify_profile_version (void) } int -TAO_Profile::supports_multicast (void) const +TAO_Profile::supports_multicast () const { // Most profiles do not support multicast endpoints. return 0; } bool -TAO_Profile::supports_non_blocking_oneways (void) const +TAO_Profile::supports_non_blocking_oneways () const { return !(this->version_.major == 1 && this->version_.minor == 0); } @@ -688,23 +686,23 @@ CORBA::Boolean TAO_Profile::compare_key (const TAO_Profile *other) const { return (this->ref_object_key_ == other->ref_object_key_) || - ((this->ref_object_key_ != 0 && - other->ref_object_key_ != 0 && + ((this->ref_object_key_ != nullptr && + other->ref_object_key_ != nullptr && this->ref_object_key_->object_key() == other->ref_object_key_->object_key())); } TAO_Endpoint * -TAO_Profile::first_filtered_endpoint (void) +TAO_Profile::first_filtered_endpoint () { TAO_Endpoint *ep = this->endpoint(); - return ep == 0 ? 0 : ep->next_filtered(this->orb_core_,0); + return ep == nullptr ? nullptr : ep->next_filtered(this->orb_core_,nullptr); } TAO_Endpoint * TAO_Profile::next_filtered_endpoint (TAO_Endpoint *source) { - if (source == 0) + if (source == nullptr) return this->first_filtered_endpoint(); return source->next_filtered(this->orb_core_,this->endpoint()); } @@ -728,15 +726,8 @@ TAO_Profile::hash_service_i (CORBA::ULong m) return this->orb_core_->hash_service (this, m); } -/* - * Hook to comment out no op method - * in the base class that is specialized in the - * derived class. - */ -//@@ TAO_PROFILE_SPL_COMMENT_HOOK_START - int -TAO_Profile::encode_alternate_endpoints(void) +TAO_Profile::encode_alternate_endpoints() { // this should be a pure virtual, but there are many // existing specializations that would need to be @@ -753,10 +744,6 @@ TAO_Profile::remove_generic_endpoint (TAO_Endpoint *) // default for virtual methods, thus a no-op } -//@@ TAO_PROFILE_SPL_COMMENT_HOOK_END - -//@@ TAO_PROFILE_SPL_METHODS_ADD_HOOK - // **************************************************************** TAO_Unknown_Profile::TAO_Unknown_Profile (CORBA::ULong tag, @@ -769,13 +756,13 @@ TAO_Unknown_Profile::TAO_Unknown_Profile (CORBA::ULong tag, } TAO_Endpoint* -TAO_Unknown_Profile::endpoint (void) +TAO_Unknown_Profile::endpoint () { - return 0; + return nullptr; } CORBA::ULong -TAO_Unknown_Profile::endpoint_count (void) const +TAO_Unknown_Profile::endpoint_count () const { return 0; } @@ -793,16 +780,16 @@ TAO_Unknown_Profile::parse_string_i (const char *) } char -TAO_Unknown_Profile::object_key_delimiter (void) const +TAO_Unknown_Profile::object_key_delimiter () const { return 0; } char * -TAO_Unknown_Profile::to_string (void) const +TAO_Unknown_Profile::to_string () const { // @@ THROW something? - return 0; + return nullptr; } int @@ -823,7 +810,7 @@ TAO_Unknown_Profile::decode_profile (TAO_InputCDR &) } int -TAO_Unknown_Profile::decode_endpoints (void) +TAO_Unknown_Profile::decode_endpoints () { return 0; } @@ -836,15 +823,15 @@ TAO_Unknown_Profile::encode (TAO_OutputCDR &stream) const } int -TAO_Unknown_Profile::encode_endpoints (void) +TAO_Unknown_Profile::encode_endpoints () { return 0; } TAO::ObjectKey * -TAO_Unknown_Profile::_key (void) const +TAO_Unknown_Profile::_key () const { - return 0; + return nullptr; } CORBA::Boolean @@ -853,7 +840,7 @@ TAO_Unknown_Profile::do_is_equivalent (const TAO_Profile* other_profile) const TAO_Unknown_Profile * op = dynamic_cast <const TAO_Unknown_Profile *> (other_profile); - return (CORBA::Boolean) (op == 0 ? 0 : this->body_ == op->body_); + return (CORBA::Boolean) (op == nullptr ? 0 : this->body_ == op->body_); } TAO_Service_Callbacks::Profile_Equivalence @@ -893,7 +880,7 @@ operator<< (TAO_OutputCDR& cdr, const TAO_opaque& x) cdr.write_ulong (length); #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) - if (x.mb () != 0) + if (x.mb () != nullptr) { cdr.write_octet_array_mb (x.mb ()); } @@ -915,7 +902,7 @@ operator>>(TAO_InputCDR& cdr, TAO_opaque& x) #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) if(ACE_BIT_DISABLED(cdr.start()->flags(), ACE_Message_Block::DONT_DELETE) - && (cdr.orb_core() == 0 + && (cdr.orb_core() == nullptr || 1 == cdr.orb_core()-> resource_factory()-> input_cdr_allocator_type_locked() diff --git a/TAO/tao/Profile.h b/TAO/tao/Profile.h index 88423d1657e..8bb9ccdcdcc 100644 --- a/TAO/tao/Profile.h +++ b/TAO/tao/Profile.h @@ -22,11 +22,7 @@ #include "tao/GIOP_Message_Version.h" #include "tao/Refcounted_ObjectKey.h" #include "tao/Service_Callbacks.h" -#if defined (ACE_HAS_CPP11) -# include <atomic> -#else -# include "ace/Atomic_Op.h" -#endif /* ACE_HAS_CPP11 */ +#include <atomic> ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Lock; @@ -66,32 +62,32 @@ public: */ //@{ /// The tag, each concrete class will have a specific tag value. - CORBA::ULong tag (void) const; + CORBA::ULong tag () const; /// Return a pointer to this profile's version. This object /// maintains ownership. - const TAO_GIOP_Message_Version &version (void) const; + const TAO_GIOP_Message_Version &version () const; /// Get a pointer to the TAO_ORB_Core. - TAO_ORB_Core *orb_core (void) const; + TAO_ORB_Core *orb_core () const; /// Increase the reference count by one on this object. - unsigned long _incr_refcnt (void); + unsigned long _incr_refcnt (); /// Decrement the object's reference count. When this count goes to /// 0 this object will be deleted. - unsigned long _decr_refcnt (void); + unsigned long _decr_refcnt (); /// Keep a pointer to the forwarded profile void forward_to (TAO_MProfile *mprofiles); /// MProfile accessor - TAO_MProfile* forward_to (void); + TAO_MProfile* forward_to (); /// Access the tagged components, notice that they they could be /// empty (or ignored) for non-GIOP protocols (and even for GIOP-1.0) - const TAO_Tagged_Components& tagged_components (void) const; - TAO_Tagged_Components& tagged_components (void); + const TAO_Tagged_Components& tagged_components () const; + TAO_Tagged_Components& tagged_components (); /// Add the given tagged component to the profile. void add_tagged_component (const IOP::TaggedComponent &component); @@ -100,14 +96,14 @@ public: * Return the current addressing mode for this profile. * In almost all cases, this is TAO_Target_Specification::Key_Addr. */ - CORBA::Short addressing_mode (void) const; + CORBA::Short addressing_mode () const; /// @deprecated Return a reference to the Object Key. - const TAO::ObjectKey &object_key (void) const; + const TAO::ObjectKey &object_key () const; /// Obtain the object key, return 0 if the profile cannot be parsed. /// The memory is owned by the caller! - TAO::ObjectKey *_key (void) const; + TAO::ObjectKey *_key () const; //@} /** @@ -130,7 +126,7 @@ public: * return the reference to that. This method is necessary for GIOP * 1.2. */ - IOP::TaggedProfile *create_tagged_profile (void); + IOP::TaggedProfile *create_tagged_profile (); /// This method sets the client exposed policies, i.e., the ones /// propagated in the IOR, for this profile. @@ -140,10 +136,10 @@ public: virtual void get_policies (CORBA::PolicyList &policy_list); /// Returns true if this profile can specify multicast endpoints. - virtual int supports_multicast (void) const; + virtual int supports_multicast () const; /// Returns true if this profile supports non blocking oneways - virtual bool supports_non_blocking_oneways (void) const; + virtual bool supports_non_blocking_oneways () const; /** * Set the addressing mode if a remote servant replies with @@ -175,7 +171,7 @@ public: virtual void addressing_mode (CORBA::Short addr_mode); /// The object key delimiter. - virtual char object_key_delimiter (void) const = 0; + virtual char object_key_delimiter () const = 0; /// Initialize this object using the given input string. /// Supports URL style of object references @@ -184,14 +180,14 @@ public: /// Return a string representation for this profile. Client must /// deallocate memory. Only one endpoint is included into the /// string. - virtual char* to_string (void) const = 0; + virtual char* to_string () const = 0; /** * Encodes this profile's endpoints into a tagged component. * This is done only if RTCORBA is enabled, since currently this is * the only case when we have more than one endpoint per profile. */ - virtual int encode_endpoints (void) = 0; + virtual int encode_endpoints () = 0; /** * Encodes this profile's endpoints into protocol specific tagged @@ -199,14 +195,14 @@ public: * endpoints on profiles. The only known implementation is IIOP, using * TAG_ALTERNATE_IIOP_ADDRESS components. */ - virtual int encode_alternate_endpoints (void); + virtual int encode_alternate_endpoints (); /** * Return a pointer to this profile's endpoint. If the profile * contains more than one endpoint, i.e., a list, the method returns * the head of the list. */ - virtual TAO_Endpoint *endpoint (void) = 0; + virtual TAO_Endpoint *endpoint () = 0; /** @@ -219,17 +215,17 @@ public: * to facilitate the Endpoint Policy's filtering function. * The default implementation of base_endpoint simply returns endpoint. */ - virtual TAO_Endpoint *base_endpoint (void); + virtual TAO_Endpoint *base_endpoint (); /// Return how many endpoints this profile contains. - virtual CORBA::ULong endpoint_count (void) const = 0; + virtual CORBA::ULong endpoint_count () const = 0; /** * Return the first endpoint in the list that matches some filtering * constraint, such as IPv6 compatibility for IIOP endpoints. This * method is implemented in terms of TAO_Endpoint::next_filtered(). */ - TAO_Endpoint *first_filtered_endpoint (void); + TAO_Endpoint *first_filtered_endpoint (); /// Return the next filtered endpoint in the list after the one /// passed in. This method is implemented in terms of @@ -273,11 +269,9 @@ public: virtual CORBA::ULong hash (CORBA::ULong max) = 0; //@} - //@@ TAO_PROFILE_SPL_PUBLIC_METHODS_ADD_HOOK - protected: /// If you have a virtual method you need a virtual dtor. - virtual ~TAO_Profile (void); + virtual ~TAO_Profile (); /** * @name Protected template methods. @@ -296,7 +290,7 @@ protected: * version of TAO or some other ORB. This is not an error, and we * must proceed. Return 0 on success and -1 on failure. */ - virtual int decode_endpoints (void) = 0; + virtual int decode_endpoints () = 0; /// Protocol specific implementation of parse_string () virtual void parse_string_i (const char *string) = 0; @@ -333,24 +327,21 @@ protected: private: /// This object keeps ownership of this object - TAO_MProfile *forward_to_i (void); + TAO_MProfile *forward_to_i (); /// Verify that the current ORB's configuration supports tagged /// components in IORs. - void verify_orb_configuration (void); + void verify_orb_configuration (); /// Verify that the given profile supports tagged components, /// i.e. is not a GIOP 1.0 profile. - void verify_profile_version (void); + void verify_profile_version (); // Profiles should not be copied or assigned! TAO_Profile (const TAO_Profile&); void operator= (const TAO_Profile&); - //@@ TAO_PROFILE_SPL_PROTECTED_METHODS_ADD_HOOK - protected: - /// IIOP version number. TAO_GIOP_Message_Version version_; @@ -384,11 +375,7 @@ private: TAO_MProfile* forward_to_; /// Number of outstanding references to this object. -#if defined (ACE_HAS_CPP11) - std::atomic<uint32_t> refcount_; -#else - ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; -#endif /* ACE_HAS_CPP11 */ + std::atomic<uint32_t> refcount_; /// A lock that protects creation of the tagged profile TAO_SYNCH_MUTEX tagged_profile_lock_; @@ -396,15 +383,10 @@ private: /// Having (tagged_profile_ != 0) doesn't mean yet that /// tagged_profile_ building is finished. bool tagged_profile_created_; - - //@@ TAO_PROFILE_SPL_PRIVATE_DATA_ADD_HOOK }; -//@@ TAO_PROFILE_SPL_EXTERN_ADD_HOOK - // A helper class to handle the various kinds of octet sequences used // inside the ORB. - typedef TAO::unbounded_value_sequence<CORBA::Octet> TAO_opaque; TAO_Export CORBA::Boolean @@ -435,19 +417,19 @@ public: // = The TAO_Profile methods look above virtual void parse_string (const char *string); - virtual char object_key_delimiter (void) const; - virtual char* to_string (void) const; + virtual char object_key_delimiter () const; + virtual char* to_string () const; virtual int decode (TAO_InputCDR& cdr); virtual int encode (TAO_OutputCDR &stream) const; - virtual int encode_endpoints (void); + virtual int encode_endpoints (); - virtual TAO::ObjectKey *_key (void) const; - virtual TAO_Endpoint *endpoint (void); - virtual CORBA::ULong endpoint_count (void) const; + virtual TAO::ObjectKey *_key () const; + virtual TAO_Endpoint *endpoint (); + virtual CORBA::ULong endpoint_count () const; virtual CORBA::ULong hash (CORBA::ULong max); virtual int decode_profile (TAO_InputCDR &cdr); - virtual int decode_endpoints (void); + virtual int decode_endpoints (); protected: virtual CORBA::Boolean do_is_equivalent (const TAO_Profile* other_profile); @@ -462,8 +444,6 @@ private: TAO_opaque body_; }; -//@@ TAO_PROFILE_SPL_EXTERN_HOOK - TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) diff --git a/TAO/tao/Profile_Transport_Resolver.cpp b/TAO/tao/Profile_Transport_Resolver.cpp index 4423d4a25fe..860a3283295 100644 --- a/TAO/tao/Profile_Transport_Resolver.cpp +++ b/TAO/tao/Profile_Transport_Resolver.cpp @@ -28,7 +28,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - Profile_Transport_Resolver::~Profile_Transport_Resolver (void) + Profile_Transport_Resolver::~Profile_Transport_Resolver () { if (this->profile_) { @@ -82,7 +82,7 @@ namespace TAO // Select the endpoint es->select_endpoint (this, max_time_val); - if (this->transport_.get () == 0) + if (this->transport_.get () == nullptr) { // No useable endpoint could be found. We will not // be able to send the message. Wait to throw an exception until @@ -130,7 +130,7 @@ namespace TAO TAO_Connector_Registry *conn_reg = this->stub_->orb_core ()->connector_registry (); - if (conn_reg == 0) + if (conn_reg == nullptr) { throw ::CORBA::INTERNAL ( CORBA::SystemException::_tao_minor_code ( @@ -148,18 +148,18 @@ namespace TAO } else if (has_con_timeout) { - if (timeout == 0 || connection_timeout < *timeout) + if (timeout == nullptr || connection_timeout < *timeout) timeout = &connection_timeout; else has_con_timeout = false; } else if (!this->blocked_) { - timeout = 0; + timeout = nullptr; } TAO_Connector *con = conn_reg->get_connector (desc->endpoint ()->tag ()); - ACE_ASSERT(con != 0); + ACE_ASSERT(con != nullptr); if (parallel) { this->transport_.set (con->parallel_connect (this, desc, timeout)); @@ -172,7 +172,7 @@ namespace TAO // If the user has set a roundtrip timeout policy, throw a timeout // exception. Otherwise, just fall through and return false to // look at the next endpoint. - if (this->transport_.get () == 0 && + if (this->transport_.get () == nullptr && has_con_timeout == false && errno == ETIME) { @@ -182,7 +182,7 @@ namespace TAO errno), CORBA::COMPLETED_NO); } - else if (this->transport_.get () == 0) + else if (this->transport_.get () == nullptr) { return false; } @@ -200,7 +200,7 @@ namespace TAO } bool - Profile_Transport_Resolver::use_parallel_connect (void) const + Profile_Transport_Resolver::use_parallel_connect () const { TAO_ORB_Core *oc = this->stub_->orb_core(); return (oc->orb_params()->use_parallel_connects() @@ -229,7 +229,7 @@ namespace TAO void - Profile_Transport_Resolver::init_inconsistent_policies (void) + Profile_Transport_Resolver::init_inconsistent_policies () { ACE_NEW_THROW_EX (this->inconsistent_policies_, CORBA::PolicyList (0), diff --git a/TAO/tao/Profile_Transport_Resolver.h b/TAO/tao/Profile_Transport_Resolver.h index 98848a61bc4..22902e6fafe 100644 --- a/TAO/tao/Profile_Transport_Resolver.h +++ b/TAO/tao/Profile_Transport_Resolver.h @@ -73,7 +73,7 @@ namespace TAO TAO_Stub *stub, bool block = true); - ~Profile_Transport_Resolver (void); + ~Profile_Transport_Resolver (); /// Method where the bunch of the action takes place. /** @@ -95,16 +95,16 @@ namespace TAO void profile (TAO_Profile *pfile); /// Accessor for profile. - TAO_Profile *profile (void) const; + TAO_Profile *profile () const; /// Accessor for TAO_Stub - TAO_Stub *stub (void) const; + TAO_Stub *stub () const; /// Accessor for the target in use - CORBA::Object *object (void) const; + CORBA::Object *object () const; /// Accessor for the transport reserved for this invocation. - TAO_Transport *transport (void) const; + TAO_Transport *transport () const; /// See if the transport cache has an available transport and /// use that one rather than trying to connect via the connector. @@ -115,12 +115,12 @@ namespace TAO /// Accessor to indicate whether we should block while /// establishing a connection. - bool blocked_connect (void) const; + bool blocked_connect () const; //@} /// Signal to let the resolver know that the transport has been /// released back to the cache. - void transport_released (void) const; + void transport_released () const; /// This is a callback method used by the endpoint selectors to /// delegate the responsibility of reserving a transport from the @@ -139,15 +139,15 @@ namespace TAO /// This method wraps a call to the orb core to see if parallel /// connection attempts are even desired. This is controlled by /// the -ORBUseParallelConnects 1|0 commandline option. - bool use_parallel_connect (void) const; + bool use_parallel_connect () const; /// Initialize the inconsistent policy list that this object has /// cached. - void init_inconsistent_policies (void); + void init_inconsistent_policies (); - CORBA::PolicyList *inconsistent_policies (void) const; + CORBA::PolicyList *inconsistent_policies () const; - CORBA::PolicyList *steal_inconsistent_policies (void); + CORBA::PolicyList *steal_inconsistent_policies (); private: /// Helper method to access get the connection timeout from the diff --git a/TAO/tao/Protocol_Factory.cpp b/TAO/tao/Protocol_Factory.cpp index d8572873fe1..9fd5df93b81 100644 --- a/TAO/tao/Protocol_Factory.cpp +++ b/TAO/tao/Protocol_Factory.cpp @@ -7,12 +7,12 @@ TAO_Protocol_Factory::TAO_Protocol_Factory (CORBA::ULong tag) { } -TAO_Protocol_Factory::~TAO_Protocol_Factory (void) +TAO_Protocol_Factory::~TAO_Protocol_Factory () { } CORBA::ULong -TAO_Protocol_Factory::tag (void) const +TAO_Protocol_Factory::tag () const { return this->tag_; } diff --git a/TAO/tao/Protocols_Hooks.cpp b/TAO/tao/Protocols_Hooks.cpp index cc344282e8d..ad56ce31a3f 100644 --- a/TAO/tao/Protocols_Hooks.cpp +++ b/TAO/tao/Protocols_Hooks.cpp @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_IIOP_Protocol_Properties::TAO_IIOP_Protocol_Properties (void) +TAO_IIOP_Protocol_Properties::TAO_IIOP_Protocol_Properties () : send_buffer_size_ (0), recv_buffer_size_ (0), keep_alive_ (0), @@ -14,13 +14,13 @@ TAO_IIOP_Protocol_Properties::TAO_IIOP_Protocol_Properties (void) { } -TAO_UIOP_Protocol_Properties::TAO_UIOP_Protocol_Properties (void) +TAO_UIOP_Protocol_Properties::TAO_UIOP_Protocol_Properties () : send_buffer_size_ (0), recv_buffer_size_ (0) { } -TAO_SHMIOP_Protocol_Properties::TAO_SHMIOP_Protocol_Properties (void) +TAO_SHMIOP_Protocol_Properties::TAO_SHMIOP_Protocol_Properties () : send_buffer_size_ (0), recv_buffer_size_ (0), keep_alive_ (0), @@ -32,7 +32,7 @@ TAO_SHMIOP_Protocol_Properties::TAO_SHMIOP_Protocol_Properties (void) { } -TAO_DIOP_Protocol_Properties::TAO_DIOP_Protocol_Properties (void) +TAO_DIOP_Protocol_Properties::TAO_DIOP_Protocol_Properties () : send_buffer_size_ (0), recv_buffer_size_ (0), enable_network_priority_ (0), @@ -41,7 +41,7 @@ TAO_DIOP_Protocol_Properties::TAO_DIOP_Protocol_Properties (void) { } -TAO_SCIOP_Protocol_Properties::TAO_SCIOP_Protocol_Properties (void) +TAO_SCIOP_Protocol_Properties::TAO_SCIOP_Protocol_Properties () : send_buffer_size_ (0), recv_buffer_size_ (0), keep_alive_ (0), @@ -52,7 +52,7 @@ TAO_SCIOP_Protocol_Properties::TAO_SCIOP_Protocol_Properties (void) { } -TAO_Protocols_Hooks::~TAO_Protocols_Hooks (void) +TAO_Protocols_Hooks::~TAO_Protocols_Hooks () { } diff --git a/TAO/tao/Protocols_Hooks.h b/TAO/tao/Protocols_Hooks.h index e7edfa9bc9d..3a8c76a844f 100644 --- a/TAO/tao/Protocols_Hooks.h +++ b/TAO/tao/Protocols_Hooks.h @@ -40,7 +40,7 @@ class TAO_Export TAO_IIOP_Protocol_Properties { public: - TAO_IIOP_Protocol_Properties (void); + TAO_IIOP_Protocol_Properties (); CORBA::Long send_buffer_size_; CORBA::Long recv_buffer_size_; @@ -55,7 +55,7 @@ class TAO_Export TAO_UIOP_Protocol_Properties { public: - TAO_UIOP_Protocol_Properties (void); + TAO_UIOP_Protocol_Properties (); CORBA::Long send_buffer_size_; CORBA::Long recv_buffer_size_; @@ -65,7 +65,7 @@ class TAO_Export TAO_SHMIOP_Protocol_Properties { public: - TAO_SHMIOP_Protocol_Properties (void); + TAO_SHMIOP_Protocol_Properties (); CORBA::Long send_buffer_size_; CORBA::Long recv_buffer_size_; @@ -81,7 +81,7 @@ class TAO_Export TAO_DIOP_Protocol_Properties { public: - TAO_DIOP_Protocol_Properties (void); + TAO_DIOP_Protocol_Properties (); CORBA::Long send_buffer_size_; CORBA::Long recv_buffer_size_; @@ -94,7 +94,7 @@ class TAO_Export TAO_SCIOP_Protocol_Properties { public: - TAO_SCIOP_Protocol_Properties (void); + TAO_SCIOP_Protocol_Properties (); CORBA::Long send_buffer_size_; CORBA::Long recv_buffer_size_; @@ -109,7 +109,7 @@ class TAO_Export TAO_Protocols_Hooks : public ACE_Service_Object { public: /// Destructor - virtual ~TAO_Protocols_Hooks (void); + virtual ~TAO_Protocols_Hooks (); /// Initialize the protocols hooks instance. virtual void init_hooks (TAO_ORB_Core *orb_core) = 0; @@ -152,7 +152,7 @@ public: virtual void client_protocol_properties_at_orb_level ( TAO_SCIOP_Protocol_Properties &protocol_properties) = 0; - virtual CORBA::Long get_dscp_codepoint (void) = 0; + virtual CORBA::Long get_dscp_codepoint () = 0; virtual void get_selector_hook (CORBA::Policy *model_policy, CORBA::Boolean &is_client_propagated, diff --git a/TAO/tao/Pseudo_VarOut_T.h b/TAO/tao/Pseudo_VarOut_T.h index 138cb64df7e..92d2bc07ca1 100644 --- a/TAO/tao/Pseudo_VarOut_T.h +++ b/TAO/tao/Pseudo_VarOut_T.h @@ -53,16 +53,16 @@ template <typename T> class TAO_Pseudo_Var_T : private TAO_Base_var { public: - TAO_Pseudo_Var_T (void); + TAO_Pseudo_Var_T (); TAO_Pseudo_Var_T (typename T::_ptr_type); TAO_Pseudo_Var_T (const TAO_Pseudo_Var_T<T> &); - ~TAO_Pseudo_Var_T (void); + ~TAO_Pseudo_Var_T (); TAO_Pseudo_Var_T<T> & operator= (typename T::_ptr_type); TAO_Pseudo_Var_T<T> & operator= (const TAO_Pseudo_Var_T<T> &); - typename T::_ptr_type operator-> (void) const; + typename T::_ptr_type operator-> () const; operator typename T::_ptr_type const & () const; operator typename T::_ptr_type & (); @@ -72,13 +72,13 @@ public: typedef typename T::_ptr_type & _out_type; typedef typename T::_ptr_type _retn_type; - _in_type in (void) const; - _inout_type inout (void); - _out_type out (void); - _retn_type _retn (void); + _in_type in () const; + _inout_type inout (); + _out_type out (); + _retn_type _retn (); // TAO extension. - _retn_type ptr (void) const; + _retn_type ptr () const; private: // Unimplemented - prevents widening assignment. @@ -109,8 +109,8 @@ public: TAO_Pseudo_Out_T<T> & operator= (typename T::_ptr_type); operator typename T::_ptr_type & (); - typename T::_ptr_type & ptr (void); - typename T::_ptr_type operator-> (void); + typename T::_ptr_type & ptr (); + typename T::_ptr_type operator-> (); private: typename T::_ptr_type & ptr_; diff --git a/TAO/tao/Queued_Data.cpp b/TAO/tao/Queued_Data.cpp index 88806f10973..438f9d8a5c4 100644 --- a/TAO/tao/Queued_Data.cpp +++ b/TAO/tao/Queued_Data.cpp @@ -34,15 +34,15 @@ clone_mb_nocopy_size (ACE_Message_Block *mb, size_t span_size) size_t const aligned_size = ACE_CDR::first_size (span_size + ACE_CDR::MAX_ALIGNMENT); // Get the allocators - ACE_Allocator *data_allocator = 0; - ACE_Allocator *data_block_allocator = 0; - ACE_Allocator *message_block_allocator = 0; + ACE_Allocator *data_allocator = nullptr; + ACE_Allocator *data_block_allocator = nullptr; + ACE_Allocator *message_block_allocator = nullptr; mb->access_allocators (data_allocator, data_block_allocator, message_block_allocator); // Create a new Message Block - ACE_Message_Block *nb = 0; + ACE_Message_Block *nb = nullptr; ACE_NEW_MALLOC_RETURN (nb, static_cast<ACE_Message_Block*> ( message_block_allocator->malloc ( @@ -50,7 +50,7 @@ clone_mb_nocopy_size (ACE_Message_Block *mb, size_t span_size) ACE_Message_Block(aligned_size, mb->msg_type(), mb->cont(), - 0, //we want the data block created + nullptr, //we want the data block created data_allocator, mb->locking_strategy(), mb->msg_priority(), @@ -58,7 +58,7 @@ clone_mb_nocopy_size (ACE_Message_Block *mb, size_t span_size) mb->msg_deadline_time (), data_block_allocator, message_block_allocator), - 0); + nullptr); ACE_CDR::mb_align (nb); @@ -77,7 +77,7 @@ TAO_Queued_Data::make_queued_data (ACE_Allocator *message_buffer_alloc, ACE_Data_Block *db) { // Get a node for the queue.. - TAO_Queued_Data *qd = 0; + TAO_Queued_Data *qd = nullptr; if (message_buffer_alloc) { @@ -85,7 +85,7 @@ TAO_Queued_Data::make_queued_data (ACE_Allocator *message_buffer_alloc, static_cast<TAO_Queued_Data *> ( message_buffer_alloc->malloc (sizeof (TAO_Queued_Data))), TAO_Queued_Data (message_buffer_alloc), - 0); + nullptr); } else @@ -93,20 +93,20 @@ TAO_Queued_Data::make_queued_data (ACE_Allocator *message_buffer_alloc, // No allocator, so use the global pool! ACE_NEW_RETURN (qd, TAO_Queued_Data, - 0); + nullptr); } // Providing an ACE_Data_Block indicates that the caller wants // an aligned ACE_Message_Block added to the TAO_Queued_Data. - if (db != 0) + if (db != nullptr) { // If this allocation fails, the TAO_Queued_Data will be leaked. - if (input_cdr_alloc == 0) + if (input_cdr_alloc == nullptr) ACE_NEW_RETURN (qd->msg_block_, ACE_Message_Block (db, 0, input_cdr_alloc), - 0); + nullptr); else ACE_NEW_MALLOC_RETURN (qd->msg_block_, static_cast<ACE_Message_Block*> ( @@ -114,7 +114,7 @@ TAO_Queued_Data::make_queued_data (ACE_Allocator *message_buffer_alloc, ACE_Message_Block (db, 0, input_cdr_alloc), - 0); + nullptr); ACE_CDR::mb_align (qd->msg_block_); } @@ -168,7 +168,7 @@ TAO_Queued_Data::duplicate (TAO_Queued_Data &sqd) (void) TAO_Queued_Data::replace_data_block (*sqd.msg_block_); - TAO_Queued_Data *qd = 0; + TAO_Queued_Data *qd = nullptr; if (sqd.allocator_) { @@ -176,7 +176,7 @@ TAO_Queued_Data::duplicate (TAO_Queued_Data &sqd) static_cast<TAO_Queued_Data *> ( sqd.allocator_->malloc (sizeof (TAO_Queued_Data))), TAO_Queued_Data (sqd), - 0); + nullptr); return qd; } @@ -193,23 +193,23 @@ TAO_Queued_Data::duplicate (TAO_Queued_Data &sqd) ACE_NEW_RETURN (qd, TAO_Queued_Data (sqd), - 0); + nullptr); return qd; } int -TAO_Queued_Data::consolidate (void) +TAO_Queued_Data::consolidate () { // Is this a chain of fragments? - if (this->state_.more_fragments () && this->msg_block_->cont () != 0) + if (this->state_.more_fragments () && this->msg_block_->cont () != nullptr) { // Create a message block big enough to hold the entire chain ACE_Message_Block *dest = clone_mb_nocopy_size ( this->msg_block_, this->msg_block_->total_length ()); - if (0 == dest) + if (nullptr == dest) { // out of memory return -1; @@ -220,7 +220,7 @@ TAO_Queued_Data::consolidate (void) // Reset the cont() parameter. We have cloned the message // block but not the chain as we will no longer have chain. - dest->cont (0); + dest->cont (nullptr); // Use ACE_CDR to consolidate the chain for us ACE_CDR::consolidate (dest, this->msg_block_); diff --git a/TAO/tao/Queued_Data.h b/TAO/tao/Queued_Data.h index e7654cd1f75..ee3b6969cc2 100644 --- a/TAO/tao/Queued_Data.h +++ b/TAO/tao/Queued_Data.h @@ -69,34 +69,34 @@ public: /// Consolidate this fragments chained message blocks into one. /// @return -1 if consolidation failed, eg out or memory, otherwise 0 - int consolidate (void); + int consolidate (); /// Get missing data - size_t missing_data (void) const; + size_t missing_data () const; /// Set missing data void missing_data (size_t data); /// Get the GIOP version - TAO_GIOP_Message_Version const &giop_version (void) const; + TAO_GIOP_Message_Version const &giop_version () const; /// Get byte_order - CORBA::Octet byte_order (void) const; + CORBA::Octet byte_order () const; /// Get more fragments - CORBA::Boolean more_fragments (void) const; + CORBA::Boolean more_fragments () const; /// Get message type - GIOP::MsgType msg_type (void) const; + GIOP::MsgType msg_type () const; /// Get next - TAO_Queued_Data *next (void) const; + TAO_Queued_Data *next () const; /// Set next void next (TAO_Queued_Data* qd); /// Get message block - ACE_Message_Block *msg_block (void) const; + ACE_Message_Block *msg_block () const; /// Set message block void msg_block (ACE_Message_Block *mb); @@ -105,7 +105,7 @@ public: void state (const TAO_GIOP_Message_State& state); /// Get the state - const TAO_GIOP_Message_State& state (void) const; + const TAO_GIOP_Message_State& state () const; private: diff --git a/TAO/tao/Queued_Message.cpp b/TAO/tao/Queued_Message.cpp index f279c7b4b57..74e2dd273d0 100644 --- a/TAO/tao/Queued_Message.cpp +++ b/TAO/tao/Queued_Message.cpp @@ -12,12 +12,12 @@ TAO_Queued_Message::TAO_Queued_Message (TAO_ORB_Core *oc, : allocator_ (alloc) , is_heap_created_ (is_heap_allocated) , orb_core_ (oc) - , next_ (0) - , prev_ (0) + , next_ (nullptr) + , prev_ (nullptr) { } -TAO_Queued_Message::~TAO_Queued_Message (void) +TAO_Queued_Message::~TAO_Queued_Message () { } @@ -25,7 +25,7 @@ void TAO_Queued_Message::remove_from_list (TAO_Queued_Message *&head, TAO_Queued_Message *&tail) { - if (this->prev_ != 0) + if (this->prev_ != nullptr) { this->prev_->next_ = this->next_; } @@ -34,7 +34,7 @@ TAO_Queued_Message::remove_from_list (TAO_Queued_Message *&head, head = this->next_; } - if (this->next_ != 0) + if (this->next_ != nullptr) { this->next_->prev_ = this->prev_; } @@ -43,26 +43,26 @@ TAO_Queued_Message::remove_from_list (TAO_Queued_Message *&head, tail = this->prev_; } - this->next_ = 0; - this->prev_ = 0; + this->next_ = nullptr; + this->prev_ = nullptr; } void TAO_Queued_Message::push_back (TAO_Queued_Message *&head, TAO_Queued_Message *&tail) { - if (tail == 0) + if (tail == nullptr) { tail = this; head = this; - this->next_ = 0; - this->prev_ = 0; + this->next_ = nullptr; + this->prev_ = nullptr; } else { tail->next_ = this; this->prev_ = tail; - this->next_ = 0; + this->next_ = nullptr; tail = this; } } @@ -71,18 +71,18 @@ void TAO_Queued_Message::push_front (TAO_Queued_Message *&head, TAO_Queued_Message *&tail) { - if (head == 0) + if (head == nullptr) { tail = this; head = this; - this->next_ = 0; - this->prev_ = 0; + this->next_ = nullptr; + this->prev_ = nullptr; } else { head->prev_ = this; this->next_ = head; - this->prev_ = 0; + this->prev_ = nullptr; head = this; } } diff --git a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h index ec5685a7e1c..ebea5fae814 100644 --- a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h +++ b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h @@ -49,7 +49,6 @@ class TAO_RTCORBA_Export TAO_Continuous_Priority_Mapping : public TAO_Priority_Mapping { public: - /// Constructor. TAO_Continuous_Priority_Mapping (int policy = ACE_SCHED_OTHER); diff --git a/TAO/tao/RTCORBA/Direct_Priority_Mapping.h b/TAO/tao/RTCORBA/Direct_Priority_Mapping.h index b0101210399..3d6137a8583 100644 --- a/TAO/tao/RTCORBA/Direct_Priority_Mapping.h +++ b/TAO/tao/RTCORBA/Direct_Priority_Mapping.h @@ -37,7 +37,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_RTCORBA_Export TAO_Direct_Priority_Mapping : public TAO_Priority_Mapping { public: - TAO_Direct_Priority_Mapping (long); /// The destructor diff --git a/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.h b/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.h index 8dbd1dcb636..69b1946e9c3 100644 --- a/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.h +++ b/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.h @@ -40,7 +40,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_RTCORBA_Export TAO_Linear_Network_Priority_Mapping : public TAO_Network_Priority_Mapping { public: - TAO_Linear_Network_Priority_Mapping (long); CORBA::Boolean to_network (RTCORBA::Priority corba_priority, diff --git a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp index 4ba033315b0..5e2f2cc3ff2 100644 --- a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp +++ b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp @@ -147,7 +147,7 @@ TAO_RT_ORB_Loader::init (int argc, ACE_TCHAR* argv[]) (ACE_TEXT("-RTORBDynamicThreadIdleTimeout")))) { const ACE_TCHAR *name = current_arg; - int timeout = ACE_OS::atoi (name); + int const timeout = ACE_OS::atoi (name); dynamic_thread_time = ACE_Time_Value (0, timeout); lifespan = TAO_RT_ORBInitializer::TAO_RTCORBA_DT_IDLE; arg_shifter.consume_arg (); @@ -156,7 +156,7 @@ TAO_RT_ORB_Loader::init (int argc, ACE_TCHAR* argv[]) (ACE_TEXT("-RTORBDynamicThreadRunTime")))) { const ACE_TCHAR *name = current_arg; - int timeout = ACE_OS::atoi (name); + int const timeout = ACE_OS::atoi (name); dynamic_thread_time = ACE_Time_Value (0, timeout); lifespan = TAO_RT_ORBInitializer::TAO_RTCORBA_DT_FIXED; arg_shifter.consume_arg (); diff --git a/TAO/tao/RTCORBA/Thread_Pool.cpp b/TAO/tao/RTCORBA/Thread_Pool.cpp index 622de35c11e..4648487aab2 100644 --- a/TAO/tao/RTCORBA/Thread_Pool.cpp +++ b/TAO/tao/RTCORBA/Thread_Pool.cpp @@ -890,11 +890,7 @@ RTCORBA::ThreadpoolId TAO_Thread_Pool_Manager::create_threadpool_helper (TAO_Thread_Pool *thread_pool) { // Make sure of safe deletion in case of errors. -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO_Thread_Pool> safe_thread_pool (thread_pool); -#else - auto_ptr<TAO_Thread_Pool> safe_thread_pool (thread_pool); -#endif /* ACE_HAS_CPP11 */ // Open the pool. thread_pool->open (); diff --git a/TAO/tao/RTPortableServer/RT_POA.cpp b/TAO/tao/RTPortableServer/RT_POA.cpp index fff8a5119b9..7bb648c4e7f 100644 --- a/TAO/tao/RTPortableServer/RT_POA.cpp +++ b/TAO/tao/RTPortableServer/RT_POA.cpp @@ -285,8 +285,7 @@ TAO_RT_POA::key_to_stub_i (const TAO::ObjectKey &object_key, type_id, client_exposed_policies._retn (), &filter, - lanes[i]->resources ().acceptor_registry () - ); + lanes[i]->resources ().acceptor_registry ()); } ACE_ASSERT (0); diff --git a/TAO/tao/RTScheduling/Current.cpp b/TAO/tao/RTScheduling/Current.cpp index 0635fcc691b..c8735b4bb16 100644 --- a/TAO/tao/RTScheduling/Current.cpp +++ b/TAO/tao/RTScheduling/Current.cpp @@ -11,7 +11,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> TAO_RTScheduler_Current::guid_counter; +std::atomic<long> TAO_RTScheduler_Current::guid_counter; u_long TAO_DTId_Hash::operator () (const IdType &id) const @@ -88,16 +88,14 @@ TAO_RTScheduler_Current::begin_scheduling_segment ( impl->begin_scheduling_segment (name, sched_param, - implicit_sched_param - ); + implicit_sched_param); } void TAO_RTScheduler_Current::update_scheduling_segment (const char * name, CORBA::Policy_ptr sched_param, - CORBA::Policy_ptr implicit_sched_param - ) + CORBA::Policy_ptr implicit_sched_param) { TAO_RTScheduler_Current_i *impl = this->implementation (); @@ -106,8 +104,7 @@ TAO_RTScheduler_Current::update_scheduling_segment (const char * name, impl->update_scheduling_segment (name, sched_param, - implicit_sched_param - ); + implicit_sched_param); } void @@ -123,8 +120,7 @@ TAO_RTScheduler_Current::end_scheduling_segment (const char * name) return; } - impl->end_scheduling_segment (name - ); + impl->end_scheduling_segment (name); } RTScheduling::DistributableThread_ptr @@ -162,8 +158,7 @@ TAO_RTScheduler_Current::spawn (RTScheduling::ThreadAction_ptr start, sched_param, implicit_sched_param, stack_size, - base_priority - ); + base_priority); } RTScheduling::Current::IdType * @@ -301,8 +296,7 @@ TAO_RTScheduler_Current_i::TAO_RTScheduler_Current_i ( orb->object_ref_table ().resolve_initial_reference ( "RTScheduler"); - this->scheduler_ = RTScheduling::Scheduler::_narrow (scheduler_obj.in () - ); + this->scheduler_ = RTScheduling::Scheduler::_narrow (scheduler_obj.in ()); } TAO_RTScheduler_Current_i::~TAO_RTScheduler_Current_i (void) @@ -335,8 +329,7 @@ TAO_RTScheduler_Current_i::begin_scheduling_segment( this->scheduler_->begin_new_scheduling_segment (this->guid_, name, sched_param, - implicit_sched_param - ); + implicit_sched_param); if (CORBA::is_nil (this->dt_.in ())) //Create new DT. @@ -371,8 +364,7 @@ TAO_RTScheduler_Current_i::begin_scheduling_segment( (this->guid_, name, sched_param, - implicit_sched_param - ); + implicit_sched_param); TAO_TSS_Resources *tss = TAO_TSS_Resources::instance (); @@ -413,8 +405,7 @@ TAO_RTScheduler_Current_i::update_scheduling_segment (const char * name, this->scheduler_->update_scheduling_segment (this->guid_, name, sched_param, - implicit_sched_param - ); + implicit_sched_param); // Remember the new values. this->name_ = CORBA::string_dup (name); @@ -435,9 +426,7 @@ TAO_RTScheduler_Current_i::end_scheduling_segment (const char * name) { // Let the scheduler know that the DT is // terminating. - this->scheduler_->end_scheduling_segment(this->guid_, - name - ); + this->scheduler_->end_scheduling_segment(this->guid_, name); // Cleanup DT. this->cleanup_DT (); @@ -452,8 +441,7 @@ TAO_RTScheduler_Current_i::end_scheduling_segment (const char * name) // scheduling segment. this->scheduler_->end_nested_scheduling_segment (this->guid_, name, - this->previous_current_->sched_param_.in () - ); + this->previous_current_->sched_param_.in ()); // Cleanup current. this->cleanup_current (); @@ -540,8 +528,7 @@ DTTask::activate_task (RTCORBA::Priority base_priority, TAO_OBJID_PRIORITYMAPPINGMANAGER); RTCORBA::PriorityMappingManager_var mapping_manager = - RTCORBA::PriorityMappingManager::_narrow (object.in () - ); + RTCORBA::PriorityMappingManager::_narrow (object.in ()); RTCORBA::PriorityMapping *pm = mapping_manager->mapping (); @@ -608,15 +595,12 @@ DTTask::svc (void) this->current_->begin_scheduling_segment (this->name_.in (), this->sched_param_.in (), - this->implicit_sched_param_.in () - ); + this->implicit_sched_param_.in ()); // Invoke entry point into new DT. - this->start_->_cxx_do (this->data_ - ); + this->start_->_cxx_do (this->data_); - this->current_->end_scheduling_segment (this->name_.in () - ); + this->current_->end_scheduling_segment (this->name_.in ()); } catch (const ::CORBA::Exception& ex) { @@ -692,8 +676,7 @@ TAO_RTScheduler_Current_i::cancel_thread (void) // Let the scheduler know that the thread has // been cancelled. - this->scheduler_->cancel (this->guid_ - ); + this->scheduler_->cancel (this->guid_); this->cleanup_DT (); diff --git a/TAO/tao/RTScheduling/Current.h b/TAO/tao/RTScheduling/Current.h index f941512b9de..4edf9c5ceb9 100644 --- a/TAO/tao/RTScheduling/Current.h +++ b/TAO/tao/RTScheduling/Current.h @@ -78,7 +78,7 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current public ::CORBA::LocalObject { public: - static ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> guid_counter; + static std::atomic<long> guid_counter; TAO_RTScheduler_Current (void); virtual ~TAO_RTScheduler_Current (void); diff --git a/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp b/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp index e2203898718..a431e8c4be4 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp +++ b/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp @@ -119,8 +119,7 @@ TAO_RTScheduler_ORB_Initializer::post_init (PortableInterceptor::ORBInitInfo_ptr // counting. // Narrow to a TAO_ORBInitInfo object to get access to the // orb_core() TAO extension. - //TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info - // ); + //TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info); if (TAO_debug_level > 0) TAOLIB_DEBUG ((LM_DEBUG, diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.inl b/TAO/tao/RTScheduling/RTScheduler_Manager.inl index 06c377c6a36..8247beea3a8 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Manager.inl +++ b/TAO/tao/RTScheduling/RTScheduler_Manager.inl @@ -217,8 +217,7 @@ TAO_RTScheduler_Manager::rtscheduler (void) } ACE_INLINE void -TAO_RTScheduler_Manager::rtscheduler (RTScheduling::Scheduler_ptr rtscheduler - ) +TAO_RTScheduler_Manager::rtscheduler (RTScheduling::Scheduler_ptr rtscheduler) { this->rtscheduler_ = RTScheduling::Scheduler::_duplicate (rtscheduler); this->orb_->orb ()->register_initial_reference ( diff --git a/TAO/tao/RTScheduling/Request_Interceptor.cpp b/TAO/tao/RTScheduling/Request_Interceptor.cpp index 37c187c7ad9..e27c5b49172 100644 --- a/TAO/tao/RTScheduling/Request_Interceptor.cpp +++ b/TAO/tao/RTScheduling/Request_Interceptor.cpp @@ -53,7 +53,7 @@ Client_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri) TAOLIB_DEBUG ((LM_DEBUG, "The Guid is %d %d\n", id, - TAO_RTScheduler_Current::guid_counter.value_i ())); + TAO_RTScheduler_Current::guid_counter.load ())); // Create new DT. RTScheduling::DistributableThread_var dt = @@ -253,8 +253,7 @@ Server_Interceptor::receive_request_service_contexts ( } void -Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri - ) +Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) { if (TAO_debug_level > 0) TAOLIB_DEBUG ((LM_DEBUG, diff --git a/TAO/tao/RTScheduling/Request_Interceptor.h b/TAO/tao/RTScheduling/Request_Interceptor.h index 5eaffea8a89..879d73a7876 100644 --- a/TAO/tao/RTScheduling/Request_Interceptor.h +++ b/TAO/tao/RTScheduling/Request_Interceptor.h @@ -13,14 +13,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -extern ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> server_guid_counter; +extern std::atomic<long> server_guid_counter; class TAO_RTScheduler_Export Client_Interceptor: public PortableInterceptor::ClientRequestInterceptor, public ::CORBA::LocalObject { public: - // Client_Interceptor (RTScheduling::Current_ptr current); virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri); @@ -37,14 +36,12 @@ public: virtual void destroy (void); static const IOP::ServiceId SchedulingInfo; - }; class TAO_RTScheduler_Export Server_Interceptor : public PortableInterceptor::ServerRequestInterceptor, public ::CORBA::LocalObject { - public: Server_Interceptor (TAO_RTScheduler_Current_ptr current); @@ -66,7 +63,6 @@ public: private: TAO_RTScheduler_Current_var current_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Reactive_Connect_Strategy.cpp b/TAO/tao/Reactive_Connect_Strategy.cpp index db4e03fc623..8593179a35a 100644 --- a/TAO/tao/Reactive_Connect_Strategy.cpp +++ b/TAO/tao/Reactive_Connect_Strategy.cpp @@ -16,7 +16,7 @@ TAO_Reactive_Connect_Strategy::TAO_Reactive_Connect_Strategy ( { } -TAO_Reactive_Connect_Strategy::~TAO_Reactive_Connect_Strategy (void) +TAO_Reactive_Connect_Strategy::~TAO_Reactive_Connect_Strategy () { } @@ -24,7 +24,7 @@ void TAO_Reactive_Connect_Strategy::synch_options (ACE_Time_Value *timeout, ACE_Synch_Options &options) { - if (timeout != 0) + if (timeout != nullptr) { options.set (ACE_Synch_Options::USE_REACTOR, *timeout); @@ -43,7 +43,7 @@ TAO_Reactive_Connect_Strategy::wait_i (TAO_LF_Event *ev, ACE_Time_Value * max_wait_time) { int result = 0; - if (ev == 0) + if (ev == nullptr) return -1; if (TAO_debug_level > 2) @@ -66,7 +66,7 @@ TAO_Reactive_Connect_Strategy::wait_i (TAO_LF_Event *ev, // Did we timeout? If so, stop running the loop. if (result == 0 && - max_wait_time != 0 && + max_wait_time != nullptr && *max_wait_time == ACE_Time_Value::zero) { errno = ETIME; diff --git a/TAO/tao/Reactive_Flushing_Strategy.cpp b/TAO/tao/Reactive_Flushing_Strategy.cpp index 9cd855e8bf0..f7bff78c6c2 100644 --- a/TAO/tao/Reactive_Flushing_Strategy.cpp +++ b/TAO/tao/Reactive_Flushing_Strategy.cpp @@ -34,7 +34,7 @@ TAO_Reactive_Flushing_Strategy::flush_message (TAO_Transport *transport, { result = orb_core->run (max_wait_time, 1); - if (max_wait_time != 0) { + if (max_wait_time != nullptr) { if (*max_wait_time <= ACE_Time_Value::zero) { errno = ETIME; result = -1; @@ -63,7 +63,7 @@ TAO_Reactive_Flushing_Strategy::flush_transport (TAO_Transport *transport if (orb_core->run (max_wait_time, 1) == -1) return -1; - if (max_wait_time != 0) { + if (max_wait_time != nullptr) { if (*max_wait_time <= ACE_Time_Value::zero) { errno = ETIME; return -1; diff --git a/TAO/tao/Refcounted_ObjectKey.cpp b/TAO/tao/Refcounted_ObjectKey.cpp index 4290884211a..64f765258d5 100644 --- a/TAO/tao/Refcounted_ObjectKey.cpp +++ b/TAO/tao/Refcounted_ObjectKey.cpp @@ -14,7 +14,7 @@ TAO::Refcounted_ObjectKey::Refcounted_ObjectKey (const TAO::ObjectKey &key) { } -TAO::Refcounted_ObjectKey::~Refcounted_ObjectKey (void) +TAO::Refcounted_ObjectKey::~Refcounted_ObjectKey () { } diff --git a/TAO/tao/Refcounted_ObjectKey.h b/TAO/tao/Refcounted_ObjectKey.h index 96142a512d6..29eb3ab6030 100644 --- a/TAO/tao/Refcounted_ObjectKey.h +++ b/TAO/tao/Refcounted_ObjectKey.h @@ -42,20 +42,20 @@ namespace TAO Refcounted_ObjectKey (const ObjectKey &ref); /// Accessor for the underlying ObjectKey. - const ObjectKey &object_key (void) const; + const ObjectKey &object_key () const; protected: friend class ObjectKey_Table; /// Protected destructor - ~Refcounted_ObjectKey (void); + ~Refcounted_ObjectKey (); /// Methods for incrementing refcount. - void incr_refcount (void); + void incr_refcount (); /// Methods for decrementing refcount. Return the refcount, used by the /// ObjectKey table. - CORBA::ULong decr_refcount (void); + CORBA::ULong decr_refcount (); private: /// The object key diff --git a/TAO/tao/Remote_Invocation.cpp b/TAO/tao/Remote_Invocation.cpp index cb8ed85c6a5..8245c697236 100644 --- a/TAO/tao/Remote_Invocation.cpp +++ b/TAO/tao/Remote_Invocation.cpp @@ -70,7 +70,7 @@ namespace TAO // IOP::IOR info, the call would create the info and return the // index that we need. CORBA::ULong index = 0; - IOP::IOR *ior_info = 0; + IOP::IOR *ior_info = nullptr; if (this->resolver_.stub ()->create_ior_info (ior_info, index) == -1) { @@ -94,7 +94,7 @@ namespace TAO void Remote_Invocation::write_header (TAO_OutputCDR &out_stream) { - this->resolver_.transport ()->clear_translators (0, &out_stream); + this->resolver_.transport ()->clear_translators (nullptr, &out_stream); TAO_Target_Specification spec; this->init_target_spec (spec, out_stream); @@ -107,7 +107,7 @@ namespace TAO throw ::CORBA::MARSHAL (); } - this->resolver_.transport ()->assign_translators (0, &out_stream); + this->resolver_.transport ()->assign_translators (nullptr, &out_stream); } Invocation_Status @@ -125,7 +125,7 @@ namespace TAO TAO_Connection_Handler *connection_handler = this->resolver_.transport ()->connection_handler (); - if (nph != 0) + if (nph != nullptr) { // nph = 0, means DiffServ library is not used // nph = 0, means DiffServ library is used, and @@ -138,7 +138,7 @@ namespace TAO this->resolver_.object ()); connection_handler->set_dscp_codepoint (dscp); } - else if (tph != 0) + else if (tph != nullptr) { // If we execute this code, DiffServ library is not used, // but RTCORBA could be used. diff --git a/TAO/tao/Remote_Object_Proxy_Broker.cpp b/TAO/tao/Remote_Object_Proxy_Broker.cpp index 390d2d7c1b4..38a1cc996d5 100644 --- a/TAO/tao/Remote_Object_Proxy_Broker.cpp +++ b/TAO/tao/Remote_Object_Proxy_Broker.cpp @@ -34,7 +34,7 @@ namespace TAO 5, TAO::TAO_CO_NONE | TAO::TAO_CO_THRU_POA_STRATEGY); - tao_call.invoke (0, 0); + tao_call.invoke (nullptr, 0); return _tao_retval.retn (); } @@ -58,7 +58,7 @@ namespace TAO 13, TAO::TAO_CO_NONE | TAO::TAO_CO_THRU_POA_STRATEGY); - _tao_call.invoke (0, 0); + _tao_call.invoke (nullptr, 0); return _tao_retval.retn (); } @@ -80,7 +80,7 @@ namespace TAO 10, TAO::TAO_CO_NONE | TAO::TAO_CO_THRU_POA_STRATEGY); - _tao_call.invoke (0, 0); + _tao_call.invoke (nullptr, 0); return _tao_retval.retn (); } @@ -93,7 +93,7 @@ namespace TAO TAO_ORB_Core::ifr_client_adapter_name () ); - if (adapter == 0) + if (adapter == nullptr) { throw ::CORBA::INTF_REPOS (); } @@ -118,7 +118,7 @@ namespace TAO 14, TAO::TAO_CO_NONE | TAO::TAO_CO_THRU_POA_STRATEGY); - _tao_call.invoke (0, 0); + _tao_call.invoke (nullptr, 0); return _tao_retval.retn (); } @@ -128,7 +128,7 @@ namespace TAO // ----------------------------------------------------- TAO::Remote_Object_Proxy_Broker * -the_tao_remote_object_proxy_broker (void) +the_tao_remote_object_proxy_broker () { static TAO::Remote_Object_Proxy_Broker the_broker; return &the_broker; diff --git a/TAO/tao/Reply_Dispatcher.cpp b/TAO/tao/Reply_Dispatcher.cpp index 620f87f65e2..93c08198894 100644 --- a/TAO/tao/Reply_Dispatcher.cpp +++ b/TAO/tao/Reply_Dispatcher.cpp @@ -17,7 +17,7 @@ TAO_Reply_Dispatcher::TAO_Reply_Dispatcher (ACE_Allocator *allocator) } // Destructor. -TAO_Reply_Dispatcher::~TAO_Reply_Dispatcher (void) +TAO_Reply_Dispatcher::~TAO_Reply_Dispatcher () { } @@ -25,7 +25,7 @@ TAO_Reply_Dispatcher::~TAO_Reply_Dispatcher (void) void TAO_Reply_Dispatcher::intrusive_add_ref (TAO_Reply_Dispatcher* rd) { - if (rd != 0) + if (rd != nullptr) { ++rd->refcount_; } @@ -34,10 +34,10 @@ TAO_Reply_Dispatcher::intrusive_add_ref (TAO_Reply_Dispatcher* rd) void TAO_Reply_Dispatcher::intrusive_remove_ref (TAO_Reply_Dispatcher* rd) { - if (rd != 0) + if (rd != nullptr) { - long const tmp = --rd->refcount_; - if (tmp <= 0) + uint32_t const tmp = --rd->refcount_; + if (tmp == 0) { if (rd->allocator_) { diff --git a/TAO/tao/Reply_Dispatcher.h b/TAO/tao/Reply_Dispatcher.h index 949bf0dfccd..0b6c39a311d 100644 --- a/TAO/tao/Reply_Dispatcher.h +++ b/TAO/tao/Reply_Dispatcher.h @@ -60,7 +60,7 @@ public: TAO_Reply_Dispatcher (ACE_Allocator *allocator = 0); /// Destructor. - virtual ~TAO_Reply_Dispatcher (void); + virtual ~TAO_Reply_Dispatcher (); /** * Dispatch the reply. Return 1 on sucess, -1 on error. @@ -74,7 +74,7 @@ public: virtual int dispatch_reply (TAO_Pluggable_Reply_Params ¶ms) = 0; /// Inform that the reply timed out - virtual void reply_timed_out (void) = 0; + virtual void reply_timed_out () = 0; /** * The used for the pending reply has been closed. @@ -84,12 +84,12 @@ public: * the exception, it would a matter of simply adding a boolean * argument to this function. */ - virtual void connection_closed (void) = 0; + virtual void connection_closed () = 0; /// Get the locate reply status. - GIOP::LocateStatusType locate_reply_status (void) const; + GIOP::LocateStatusType locate_reply_status () const; - GIOP::ReplyStatusType reply_status (void) const; + GIOP::ReplyStatusType reply_status () const; static void intrusive_add_ref (TAO_Reply_Dispatcher*); static void intrusive_remove_ref (TAO_Reply_Dispatcher*); @@ -103,7 +103,7 @@ protected: private: /// Support for intrusive reference counting - ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> refcount_; + std::atomic<uint32_t> refcount_; /// Allocator that was used to allocate this reply dispatcher. In case of /// zero we come from the heap. diff --git a/TAO/tao/Reply_Dispatcher.inl b/TAO/tao/Reply_Dispatcher.inl index 14e89c247a8..c00cb49c567 100644 --- a/TAO/tao/Reply_Dispatcher.inl +++ b/TAO/tao/Reply_Dispatcher.inl @@ -3,13 +3,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE GIOP::LocateStatusType -TAO_Reply_Dispatcher::locate_reply_status (void) const +TAO_Reply_Dispatcher::locate_reply_status () const { return this->locate_reply_status_; } ACE_INLINE GIOP::ReplyStatusType -TAO_Reply_Dispatcher::reply_status (void) const +TAO_Reply_Dispatcher::reply_status () const { return this->reply_status_; } diff --git a/TAO/tao/RequestInterceptor_Adapter.cpp b/TAO/tao/RequestInterceptor_Adapter.cpp index c19df8e51df..171df98cd94 100644 --- a/TAO/tao/RequestInterceptor_Adapter.cpp +++ b/TAO/tao/RequestInterceptor_Adapter.cpp @@ -13,7 +13,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO::RequestInterceptor_Adapter::~RequestInterceptor_Adapter (void) +TAO::RequestInterceptor_Adapter::~RequestInterceptor_Adapter () { } diff --git a/TAO/tao/RequestInterceptor_Adapter.h b/TAO/tao/RequestInterceptor_Adapter.h index 8ea064cf865..3a85af71c63 100644 --- a/TAO/tao/RequestInterceptor_Adapter.h +++ b/TAO/tao/RequestInterceptor_Adapter.h @@ -35,9 +35,9 @@ namespace TAO class TAO_Export RequestInterceptor_Adapter { public: - virtual ~RequestInterceptor_Adapter (void); + virtual ~RequestInterceptor_Adapter (); - virtual void destroy_interceptors (void) = 0; + virtual void destroy_interceptors () = 0; virtual void popTSC (TAO_ORB_Core *orb_core_) = 0; virtual void pushTSC (TAO_ORB_Core *orb_core_) = 0; diff --git a/TAO/tao/Request_Dispatcher.cpp b/TAO/tao/Request_Dispatcher.cpp index 16a77d9459c..b7c031f1eee 100644 --- a/TAO/tao/Request_Dispatcher.cpp +++ b/TAO/tao/Request_Dispatcher.cpp @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Request_Dispatcher::~TAO_Request_Dispatcher (void) +TAO_Request_Dispatcher::~TAO_Request_Dispatcher () { } diff --git a/TAO/tao/Resource_Factory.cpp b/TAO/tao/Resource_Factory.cpp index 46dc712b08a..9a7299be1a6 100644 --- a/TAO/tao/Resource_Factory.cpp +++ b/TAO/tao/Resource_Factory.cpp @@ -7,25 +7,25 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Protocol_Item::TAO_Protocol_Item (const ACE_CString &name) : name_ (name), - factory_ (0), + factory_ (nullptr), factory_owner_ (0) { } -TAO_Protocol_Item::~TAO_Protocol_Item (void) +TAO_Protocol_Item::~TAO_Protocol_Item () { if (this->factory_owner_ == 1) delete this->factory_; } const ACE_CString & -TAO_Protocol_Item::protocol_name (void) +TAO_Protocol_Item::protocol_name () { return this->name_; } TAO_Protocol_Factory * -TAO_Protocol_Item::factory (void) +TAO_Protocol_Item::factory () { return this->factory_; } @@ -42,24 +42,24 @@ TAO_Protocol_Item::factory (TAO_Protocol_Factory *factory, // ******************************************************************** -TAO_Resource_Factory::TAO_Resource_Factory (void) +TAO_Resource_Factory::TAO_Resource_Factory () { } -TAO_Resource_Factory::~TAO_Resource_Factory (void) +TAO_Resource_Factory::~TAO_Resource_Factory () { } int -TAO_Resource_Factory::use_locked_data_blocks (void) const +TAO_Resource_Factory::use_locked_data_blocks () const { return 0; } ACE_Reactor * -TAO_Resource_Factory::get_reactor (void) +TAO_Resource_Factory::get_reactor () { - return 0; + return nullptr; } void @@ -69,15 +69,15 @@ TAO_Resource_Factory::reclaim_reactor (ACE_Reactor *) } TAO_Connector_Registry * -TAO_Resource_Factory::get_connector_registry (void) +TAO_Resource_Factory::get_connector_registry () { - return 0; + return nullptr; } TAO_Acceptor_Registry * -TAO_Resource_Factory::get_acceptor_registry (void) +TAO_Resource_Factory::get_acceptor_registry () { - return 0; + return nullptr; } void @@ -86,91 +86,91 @@ TAO_Resource_Factory::use_local_memory_pool (bool) } ACE_Allocator * -TAO_Resource_Factory::input_cdr_dblock_allocator (void) +TAO_Resource_Factory::input_cdr_dblock_allocator () { - return 0; + return nullptr; } ACE_Allocator * -TAO_Resource_Factory::input_cdr_buffer_allocator (void) +TAO_Resource_Factory::input_cdr_buffer_allocator () { - return 0; + return nullptr; } ACE_Allocator * -TAO_Resource_Factory::input_cdr_msgblock_allocator (void) +TAO_Resource_Factory::input_cdr_msgblock_allocator () { - return 0; + return nullptr; } int -TAO_Resource_Factory::input_cdr_allocator_type_locked (void) +TAO_Resource_Factory::input_cdr_allocator_type_locked () { return -1; } ACE_Allocator * -TAO_Resource_Factory::output_cdr_dblock_allocator (void) +TAO_Resource_Factory::output_cdr_dblock_allocator () { - return 0; + return nullptr; } ACE_Allocator * -TAO_Resource_Factory::output_cdr_buffer_allocator (void) +TAO_Resource_Factory::output_cdr_buffer_allocator () { - return 0; + return nullptr; } ACE_Allocator * -TAO_Resource_Factory::output_cdr_msgblock_allocator (void) +TAO_Resource_Factory::output_cdr_msgblock_allocator () { - return 0; + return nullptr; } ACE_Allocator * -TAO_Resource_Factory::amh_response_handler_allocator (void) +TAO_Resource_Factory::amh_response_handler_allocator () { - return 0; + return nullptr; } ACE_Allocator * -TAO_Resource_Factory::ami_response_handler_allocator (void) +TAO_Resource_Factory::ami_response_handler_allocator () { - return 0; + return nullptr; } TAO_ProtocolFactorySet * -TAO_Resource_Factory::get_protocol_factories (void) +TAO_Resource_Factory::get_protocol_factories () { - return 0; + return nullptr; } int -TAO_Resource_Factory::init_protocol_factories (void) +TAO_Resource_Factory::init_protocol_factories () { return -1; } TAO_Codeset_Manager * -TAO_Resource_Factory::codeset_manager (void) +TAO_Resource_Factory::codeset_manager () { - return 0; + return nullptr; } int -TAO_Resource_Factory::cache_maximum (void) const +TAO_Resource_Factory::cache_maximum () const { return TAO_CONNECTION_CACHE_MAXIMUM; } int -TAO_Resource_Factory::purge_percentage (void) const +TAO_Resource_Factory::purge_percentage () const { return 0; } int -TAO_Resource_Factory::max_muxed_connections (void) const +TAO_Resource_Factory::max_muxed_connections () const { return 0; } @@ -183,19 +183,19 @@ TAO_Resource_Factory::get_parser_names (char **&, int &) } ACE_Lock * -TAO_Resource_Factory::create_cached_connection_lock (void) +TAO_Resource_Factory::create_cached_connection_lock () { - return 0; + return nullptr; } int -TAO_Resource_Factory::locked_transport_cache (void) +TAO_Resource_Factory::locked_transport_cache () { return 0; } int -TAO_Resource_Factory::load_default_protocols (void) +TAO_Resource_Factory::load_default_protocols () { return 0; } diff --git a/TAO/tao/Resource_Factory.h b/TAO/tao/Resource_Factory.h index 40c96ebbdd8..ab672ad3aec 100644 --- a/TAO/tao/Resource_Factory.h +++ b/TAO/tao/Resource_Factory.h @@ -58,23 +58,23 @@ public: /// Destructor that deallocates the factory object if the /// Protocol_Item retains ownership. - ~TAO_Protocol_Item (void); + ~TAO_Protocol_Item (); /// Return a reference to the character representation of the protocol /// factories name. - const ACE_CString &protocol_name (void); + const ACE_CString &protocol_name (); /// Return a pointer to the protocol factory. - TAO_Protocol_Factory *factory (void); + TAO_Protocol_Factory *factory (); /// Set the factory pointer's value. void factory (TAO_Protocol_Factory *factory, int owner = 0); private: - - // Disallow copying and assignment. - TAO_Protocol_Item (const TAO_Protocol_Item&); - void operator= (const TAO_Protocol_Item&); + TAO_Protocol_Item (const TAO_Protocol_Item&) = delete; + void operator= (const TAO_Protocol_Item&) = delete; + TAO_Protocol_Item (TAO_Protocol_Item&&) = delete; + void operator= (TAO_Protocol_Item&&) = delete; private: /// Protocol factory name. @@ -133,52 +133,52 @@ public: TAO_LAZY }; - TAO_Resource_Factory (void); - virtual ~TAO_Resource_Factory (void); + TAO_Resource_Factory (); + virtual ~TAO_Resource_Factory (); // = Resource Retrieval /// @@ Backwards compatibility, return 1 if the ORB core should use /// Locked_Data_Blocks - virtual int use_locked_data_blocks (void) const; + virtual int use_locked_data_blocks () const; /// Return an ACE_Reactor to be utilized. - virtual ACE_Reactor *get_reactor (void); + virtual ACE_Reactor *get_reactor (); /// Reclaim reactor resources (e.g. deallocate, etc). virtual void reclaim_reactor (ACE_Reactor *reactor); /// Return a reference to the acceptor registry. - virtual TAO_Acceptor_Registry *get_acceptor_registry (void); + virtual TAO_Acceptor_Registry *get_acceptor_registry (); /// Return a connector to be utilized. - virtual TAO_Connector_Registry *get_connector_registry (void); + virtual TAO_Connector_Registry *get_connector_registry (); /// Return the Allocator's memory pool type virtual void use_local_memory_pool (bool); /// @name Access the input CDR allocators. //@{ - virtual ACE_Allocator* input_cdr_dblock_allocator (void); - virtual ACE_Allocator* input_cdr_buffer_allocator (void); - virtual ACE_Allocator* input_cdr_msgblock_allocator (void); + virtual ACE_Allocator* input_cdr_dblock_allocator (); + virtual ACE_Allocator* input_cdr_buffer_allocator (); + virtual ACE_Allocator* input_cdr_msgblock_allocator (); //@} // Return 1 when the input CDR allocator uses a lock else 0. - virtual int input_cdr_allocator_type_locked (void); + virtual int input_cdr_allocator_type_locked (); /// @name Access the output CDR allocators. //@{ - virtual ACE_Allocator* output_cdr_dblock_allocator (void); - virtual ACE_Allocator* output_cdr_buffer_allocator (void); - virtual ACE_Allocator* output_cdr_msgblock_allocator (void); + virtual ACE_Allocator* output_cdr_dblock_allocator (); + virtual ACE_Allocator* output_cdr_buffer_allocator (); + virtual ACE_Allocator* output_cdr_msgblock_allocator (); //@} /// Access the AMH response handler allocator - virtual ACE_Allocator* amh_response_handler_allocator (void); + virtual ACE_Allocator* amh_response_handler_allocator (); /// Access the AMI response handler allocator - virtual ACE_Allocator* ami_response_handler_allocator (void); + virtual ACE_Allocator* ami_response_handler_allocator (); /** * The protocol factory list is implemented in this class since @@ -186,7 +186,7 @@ public: * b) it is initialized at start up and then not altered. * Returns a container holding the list of loaded protocols. */ - virtual TAO_ProtocolFactorySet *get_protocol_factories (void); + virtual TAO_ProtocolFactorySet *get_protocol_factories (); /** * This method will loop through the protocol list and @@ -196,43 +196,43 @@ public: * that only one thread will call this method at ORB initialization. * NON-THREAD-SAFE */ - virtual int init_protocol_factories (void); + virtual int init_protocol_factories (); /// Gets the codeset manager. - virtual TAO_Codeset_Manager* codeset_manager (void); + virtual TAO_Codeset_Manager* codeset_manager (); /// This denotes the maximum number of connections that can be cached. - virtual int cache_maximum (void) const; + virtual int cache_maximum () const; /// This denotes the amount of entries to remove from the connection /// cache. - virtual int purge_percentage (void) const; + virtual int purge_percentage () const; /// Return the number of muxed connections that are allowed for a /// remote endpoint - virtual int max_muxed_connections (void) const; + virtual int max_muxed_connections () const; virtual int get_parser_names (char **&names, int &number_of_names); /// Creates the lock for the lock needed in the Cache Map /// @deprecated - virtual ACE_Lock *create_cached_connection_lock (void); + virtual ACE_Lock *create_cached_connection_lock (); /// Should the transport cache have a lock or not? Return 1 if the /// transport cache needs to be locked else return 0 - virtual int locked_transport_cache (void); + virtual int locked_transport_cache (); /// Creates the flushing strategy. The new instance is owned by the /// caller. - virtual TAO_Flushing_Strategy *create_flushing_strategy (void) = 0; + virtual TAO_Flushing_Strategy *create_flushing_strategy () = 0; /// Creates the connection purging strategy. - virtual TAO_Connection_Purging_Strategy *create_purging_strategy (void) = 0; + virtual TAO_Connection_Purging_Strategy *create_purging_strategy () = 0; /// Creates the leader followers strategy. The new instance is owned by the /// caller. - virtual TAO_LF_Strategy *create_lf_strategy (void) = 0; + virtual TAO_LF_Strategy *create_lf_strategy () = 0; /// Outgoing fragment creation strategy. virtual TAO_GIOP_Fragmentation_Strategy* @@ -243,12 +243,12 @@ public: /// this function should be called on the previously used (default) /// factory. This should result in proper error reporting if the /// user attempts to set options on an unused factory. - virtual void disable_factory (void) = 0; + virtual void disable_factory () = 0; /// Return the resource usage strategy. virtual TAO_Resource_Factory::Resource_Usage - resource_usage_strategy (void) const = 0; + resource_usage_strategy () const = 0; /// Return the value of the strategy that indicates whether /// the ORB should wait for the replies during shutdown or drop @@ -261,7 +261,7 @@ protected: * advanced_resource.cpp can call the one in default_resource.cpp * without calling unnecessary functions. */ - virtual int load_default_protocols (void); + virtual int load_default_protocols (); }; diff --git a/TAO/tao/Resume_Handle.cpp b/TAO/tao/Resume_Handle.cpp index 48318ca247c..9340184e28b 100644 --- a/TAO/tao/Resume_Handle.cpp +++ b/TAO/tao/Resume_Handle.cpp @@ -12,7 +12,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL void -TAO_Resume_Handle::resume_handle (void) +TAO_Resume_Handle::resume_handle () { // If we have a complete message, just resume the handler // Resume the handler. diff --git a/TAO/tao/Seq_Out_T.h b/TAO/tao/Seq_Out_T.h index 693b5508b24..e677d4e505e 100644 --- a/TAO/tao/Seq_Out_T.h +++ b/TAO/tao/Seq_Out_T.h @@ -42,10 +42,10 @@ public: TAO_Seq_Out_T &operator= (T *); operator T *& (); - T * operator-> (void); + T * operator-> (); T_elem operator[] (CORBA::ULong index); - T *& ptr (void); + T *& ptr (); private: T *& ptr_; diff --git a/TAO/tao/Seq_Var_T.h b/TAO/tao/Seq_Var_T.h index 45cb0491254..7596db9730a 100644 --- a/TAO/tao/Seq_Var_T.h +++ b/TAO/tao/Seq_Var_T.h @@ -34,14 +34,14 @@ class TAO_Seq_Var_Base_T public: typedef typename T::subscript_type T_elem; - TAO_Seq_Var_Base_T (void); + TAO_Seq_Var_Base_T (); TAO_Seq_Var_Base_T (T *); TAO_Seq_Var_Base_T (const TAO_Seq_Var_Base_T<T> &); - ~TAO_Seq_Var_Base_T (void); + ~TAO_Seq_Var_Base_T (); - T *operator-> (void); - const T *operator-> (void) const; + T *operator-> (); + const T *operator-> () const; operator const T & () const; operator T & (); @@ -53,13 +53,13 @@ public: typedef T * _retn_type; // in, inout, out, _retn - _in_type in (void) const; - _inout_type inout (void); - _out_type out (void); - _retn_type _retn (void); + _in_type in () const; + _inout_type inout (); + _out_type out (); + _retn_type _retn (); /// TAO extension. - _retn_type ptr (void) const; + _retn_type ptr () const; protected: T * ptr_; @@ -78,7 +78,7 @@ public: typedef typename T::subscript_type T_elem; typedef typename T::const_subscript_type T_const_elem; - TAO_FixedSeq_Var_T (void); + TAO_FixedSeq_Var_T (); TAO_FixedSeq_Var_T (T *); TAO_FixedSeq_Var_T (const TAO_FixedSeq_Var_T<T> &); @@ -108,7 +108,7 @@ public: typedef typename T::subscript_type T_elem; typedef typename T::const_subscript_type T_const_elem; - TAO_VarSeq_Var_T (void); + TAO_VarSeq_Var_T (); TAO_VarSeq_Var_T (T *); TAO_VarSeq_Var_T (const TAO_VarSeq_Var_T<T> &); diff --git a/TAO/tao/ServerRequestInterceptor_Adapter.cpp b/TAO/tao/ServerRequestInterceptor_Adapter.cpp index ff032bbdb59..32a4eb26a2d 100644 --- a/TAO/tao/ServerRequestInterceptor_Adapter.cpp +++ b/TAO/tao/ServerRequestInterceptor_Adapter.cpp @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO::ServerRequestInterceptor_Adapter::~ServerRequestInterceptor_Adapter (void) +TAO::ServerRequestInterceptor_Adapter::~ServerRequestInterceptor_Adapter () { } diff --git a/TAO/tao/ServerRequestInterceptor_Adapter.h b/TAO/tao/ServerRequestInterceptor_Adapter.h index 8377f130a47..d4d36949cad 100644 --- a/TAO/tao/ServerRequestInterceptor_Adapter.h +++ b/TAO/tao/ServerRequestInterceptor_Adapter.h @@ -66,7 +66,7 @@ namespace TAO : public RequestInterceptor_Adapter { public: - virtual ~ServerRequestInterceptor_Adapter (void); + virtual ~ServerRequestInterceptor_Adapter (); /** * @name PortableInterceptor Server Side Interception Points @@ -91,7 +91,7 @@ namespace TAO /// This method implements the "intermediate" server side /// interception point if the above #ifdef is set to 1 and a - /// starting intercetion point if it is not set to 1. + /// starting interception point if it is not set to 1. /// /// @note This method should have been the "starting" interception /// point according to the interceptor spec. This will be @@ -153,7 +153,7 @@ namespace TAO PortableInterceptor::ServerRequestInterceptor_ptr interceptor, const CORBA::PolicyList& policies) = 0; - virtual TAO::PICurrent_Impl *allocate_pi_current (void) = 0; + virtual TAO::PICurrent_Impl *allocate_pi_current () = 0; virtual void deallocate_pi_current (TAO::PICurrent_Impl *picurrent) = 0; diff --git a/TAO/tao/ServerRequestInterceptor_Adapter_Factory.cpp b/TAO/tao/ServerRequestInterceptor_Adapter_Factory.cpp index be5ff8d08c5..148cc664a82 100644 --- a/TAO/tao/ServerRequestInterceptor_Adapter_Factory.cpp +++ b/TAO/tao/ServerRequestInterceptor_Adapter_Factory.cpp @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_ServerRequestInterceptor_Adapter_Factory::~TAO_ServerRequestInterceptor_Adapter_Factory (void) +TAO_ServerRequestInterceptor_Adapter_Factory::~TAO_ServerRequestInterceptor_Adapter_Factory () { } diff --git a/TAO/tao/ServerRequestInterceptor_Adapter_Factory.h b/TAO/tao/ServerRequestInterceptor_Adapter_Factory.h index 9f0337c6e67..945ef4c9163 100644 --- a/TAO/tao/ServerRequestInterceptor_Adapter_Factory.h +++ b/TAO/tao/ServerRequestInterceptor_Adapter_Factory.h @@ -38,9 +38,9 @@ class TAO_Export TAO_ServerRequestInterceptor_Adapter_Factory : public ACE_Service_Object { public: - virtual ~TAO_ServerRequestInterceptor_Adapter_Factory (void); + virtual ~TAO_ServerRequestInterceptor_Adapter_Factory (); - virtual TAO::ServerRequestInterceptor_Adapter * create (void) = 0; + virtual TAO::ServerRequestInterceptor_Adapter * create () = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Server_Strategy_Factory.cpp b/TAO/tao/Server_Strategy_Factory.cpp index 94b91cbaf42..a0cdd404f4a 100644 --- a/TAO/tao/Server_Strategy_Factory.cpp +++ b/TAO/tao/Server_Strategy_Factory.cpp @@ -3,22 +3,22 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Server_Strategy_Factory::TAO_Server_Strategy_Factory (void) +TAO_Server_Strategy_Factory::TAO_Server_Strategy_Factory () : active_object_map_creation_parameters_ () { } -TAO_Server_Strategy_Factory::~TAO_Server_Strategy_Factory(void) +TAO_Server_Strategy_Factory::~TAO_Server_Strategy_Factory() { } const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters & -TAO_Server_Strategy_Factory::active_object_map_creation_parameters (void) const +TAO_Server_Strategy_Factory::active_object_map_creation_parameters () const { return this->active_object_map_creation_parameters_; } -TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters::Active_Object_Map_Creation_Parameters (void) +TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters::Active_Object_Map_Creation_Parameters () : active_object_map_size_ (TAO_DEFAULT_SERVER_ACTIVE_OBJECT_MAP_SIZE), object_lookup_strategy_for_user_id_policy_ (TAO_DYNAMIC_HASH), object_lookup_strategy_for_system_id_policy_ (TAO_ACTIVE_DEMUX), diff --git a/TAO/tao/Server_Strategy_Factory.h b/TAO/tao/Server_Strategy_Factory.h index c168c92acea..88a4491ffa6 100644 --- a/TAO/tao/Server_Strategy_Factory.h +++ b/TAO/tao/Server_Strategy_Factory.h @@ -49,7 +49,7 @@ public: struct Active_Object_Map_Creation_Parameters { /// Constructor. - Active_Object_Map_Creation_Parameters (void); + Active_Object_Map_Creation_Parameters (); /// Default size of object lookup table. CORBA::ULong active_object_map_size_; @@ -85,10 +85,10 @@ public: }; /// Constructor. - TAO_Server_Strategy_Factory (void); + TAO_Server_Strategy_Factory (); /// Destructor. - virtual ~TAO_Server_Strategy_Factory(void); + virtual ~TAO_Server_Strategy_Factory(); /** * Call <open> on various strategies. This is not performed in @@ -99,7 +99,7 @@ public: virtual int open (TAO_ORB_Core* orb_core) = 0; /// Are server connections active (i.e. run in their own thread) - virtual int activate_server_connections (void) = 0; + virtual int activate_server_connections () = 0; /** * Obtain the timeout value used by the thread-per-connection server @@ -111,13 +111,13 @@ public: virtual int thread_per_connection_timeout (ACE_Time_Value &timeout) = 0; /// The thread activation parameters - virtual int server_connection_thread_flags (void) = 0; - virtual int server_connection_thread_count (void) = 0; + virtual int server_connection_thread_flags () = 0; + virtual int server_connection_thread_count () = 0; /// Return the active object map creation parameters. virtual const Active_Object_Map_Creation_Parameters & - active_object_map_creation_parameters (void) const; + active_object_map_creation_parameters () const; protected: /// Active object map creation parameters. diff --git a/TAO/tao/Service_Callbacks.cpp b/TAO/tao/Service_Callbacks.cpp index b830c4d863c..bf71128e2ae 100644 --- a/TAO/tao/Service_Callbacks.cpp +++ b/TAO/tao/Service_Callbacks.cpp @@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Service_Callbacks::~TAO_Service_Callbacks (void) +TAO_Service_Callbacks::~TAO_Service_Callbacks () { } @@ -16,7 +16,6 @@ TAO_Service_Callbacks::select_profile (const TAO_MProfile & /*mprofile*/, return false; } - CORBA::Boolean TAO_Service_Callbacks::object_is_nil (CORBA::Object_ptr /* obj */) { @@ -25,7 +24,6 @@ TAO_Service_Callbacks::object_is_nil (CORBA::Object_ptr /* obj */) return true; } - TAO_Service_Callbacks::Profile_Equivalence TAO_Service_Callbacks::is_profile_equivalent (const TAO_Profile *, const TAO_Profile *) diff --git a/TAO/tao/Service_Callbacks.h b/TAO/tao/Service_Callbacks.h index 9940ab56ac0..5eddb99847f 100644 --- a/TAO/tao/Service_Callbacks.h +++ b/TAO/tao/Service_Callbacks.h @@ -51,13 +51,12 @@ namespace IOP * @brief An Abstract Base class for the hooks in the ORB. * * This class (would) define all the hooks that may be needed by - * the ORB to override some of its default behaviour. The methods + * the ORB to override some of its default behavior. The methods * can be potentially used to call service level specific * processing that may be required. */ class TAO_Export TAO_Service_Callbacks { - public: enum Profile_Equivalence @@ -67,9 +66,8 @@ public: DONT_KNOW }; - /// Dtor - virtual ~TAO_Service_Callbacks (void); + virtual ~TAO_Service_Callbacks (); /// Select the profile from MProfile as the needs of the services /// may be. Return the profile in @a pfile @@ -79,7 +77,6 @@ public: /// Check whether @a obj is nil or not. virtual CORBA::Boolean object_is_nil (CORBA::Object_ptr obj); - /// Check for equivalency of the two profiles virtual Profile_Equivalence is_profile_equivalent (const TAO_Profile *, const TAO_Profile *); diff --git a/TAO/tao/Service_Context.cpp b/TAO/tao/Service_Context.cpp index f39f2ce2a88..7f29afdd6bc 100644 --- a/TAO/tao/Service_Context.cpp +++ b/TAO/tao/Service_Context.cpp @@ -22,7 +22,7 @@ TAO_Service_Context::set_context_i (IOP::ServiceId id, TAO_OutputCDR &cdr) CORBA::Octet *buf = context.context_data.get_buffer (); for (const ACE_Message_Block *i = cdr.begin (); - i != 0; + i != nullptr; i = i->cont ()) { ACE_OS::memcpy (buf, i->rd_ptr (), i->length ()); @@ -42,7 +42,7 @@ TAO_Service_Context::set_context_i (IOP::ServiceContext &context, CORBA::Octet *buf = context.context_data.get_buffer (); for (const ACE_Message_Block *i = cdr.begin (); - i != 0; + i != nullptr; i = i->cont ()) { ACE_OS::memcpy (buf, i->rd_ptr (), i->length ()); diff --git a/TAO/tao/Service_Context.h b/TAO/tao/Service_Context.h index 6232de26ba3..fc1668c4125 100644 --- a/TAO/tao/Service_Context.h +++ b/TAO/tao/Service_Context.h @@ -64,7 +64,7 @@ public: friend class TAO::CSD::FW_Server_Request_Wrapper; /// Constructor - TAO_Service_Context (void); + TAO_Service_Context (); /// = Generic components @@ -118,12 +118,12 @@ public: int decode (TAO_InputCDR& cdr); /// Return the underlying service context list - IOP::ServiceContextList &service_info (void); + IOP::ServiceContextList &service_info (); /// @note This method is only for backward comptiblity. We /// need to get this removed once RT folks have their service /// addition info done through this interface - const IOP::ServiceContextList &service_info (void) const; + const IOP::ServiceContextList &service_info () const; private: /// Helper methods to implement set_context() diff --git a/TAO/tao/Service_Context_Handler.cpp b/TAO/tao/Service_Context_Handler.cpp index b6d2800fd34..1f80a63dcf2 100644 --- a/TAO/tao/Service_Context_Handler.cpp +++ b/TAO/tao/Service_Context_Handler.cpp @@ -3,11 +3,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Service_Context_Handler::TAO_Service_Context_Handler (void) +TAO_Service_Context_Handler::TAO_Service_Context_Handler () { } -TAO_Service_Context_Handler::~TAO_Service_Context_Handler (void) +TAO_Service_Context_Handler::~TAO_Service_Context_Handler () { } diff --git a/TAO/tao/Service_Context_Handler_Registry.cpp b/TAO/tao/Service_Context_Handler_Registry.cpp index 7cf3a049332..550056efe2e 100644 --- a/TAO/tao/Service_Context_Handler_Registry.cpp +++ b/TAO/tao/Service_Context_Handler_Registry.cpp @@ -49,7 +49,7 @@ TAO_Service_Context_Registry::generate_service_context ( return result; } -TAO_Service_Context_Registry::~TAO_Service_Context_Registry (void) +TAO_Service_Context_Registry::~TAO_Service_Context_Registry () { for (Table::iterator x = this->registry_.begin (); x != this->registry_.end (); diff --git a/TAO/tao/Service_Context_Handler_Registry.h b/TAO/tao/Service_Context_Handler_Registry.h index 90295c80123..86277a13fd6 100644 --- a/TAO/tao/Service_Context_Handler_Registry.h +++ b/TAO/tao/Service_Context_Handler_Registry.h @@ -35,7 +35,7 @@ class TAO_Export TAO_Service_Context_Registry public: /// Destructor - ~TAO_Service_Context_Registry (void); + ~TAO_Service_Context_Registry (); /** * Bind a new entry in the registry diff --git a/TAO/tao/Services_Activate.cpp b/TAO/tao/Services_Activate.cpp index 6fffafa3c84..97f5307725c 100644 --- a/TAO/tao/Services_Activate.cpp +++ b/TAO/tao/Services_Activate.cpp @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Services_Activate::~TAO_Services_Activate (void) +TAO_Services_Activate::~TAO_Services_Activate () { } diff --git a/TAO/tao/Special_Basic_Argument_T.h b/TAO/tao/Special_Basic_Argument_T.h index 03f6ac34ec2..47b72cabd25 100644 --- a/TAO/tao/Special_Basic_Argument_T.h +++ b/TAO/tao/Special_Basic_Argument_T.h @@ -43,7 +43,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S const & arg (void) const; + S const & arg () const; protected: S const & x_; @@ -63,9 +63,9 @@ namespace TAO { public: In_Special_Basic_Clonable_Argument_T (S const &); - virtual ~In_Special_Basic_Clonable_Argument_T (void); + virtual ~In_Special_Basic_Clonable_Argument_T (); - virtual Argument* clone (void); + virtual Argument* clone (); private: bool is_clone_; @@ -90,7 +90,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S & arg (void); + S & arg (); private: S & x_; @@ -114,7 +114,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S & arg (void); + S & arg (); private: S & x_; @@ -132,16 +132,16 @@ namespace TAO class Ret_Special_Basic_Argument_T : public RetArgument { public: - Ret_Special_Basic_Argument_T (void); + Ret_Special_Basic_Argument_T (); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S & arg (void); + S & arg (); - S excp (void); - S retn (void); + S excp (); + S retn (); private: S x_; diff --git a/TAO/tao/Storable_Base.cpp b/TAO/tao/Storable_Base.cpp index 083199b8bf7..a04f09d1564 100644 --- a/TAO/tao/Storable_Base.cpp +++ b/TAO/tao/Storable_Base.cpp @@ -20,7 +20,7 @@ bool TAO::Storable_Base::use_backup_default = false; bool TAO::Storable_Base::retry_on_ebadf_default = false; void -TAO::Storable_Base::remove (void) +TAO::Storable_Base::remove () { if (this->use_backup_) { diff --git a/TAO/tao/Storable_Factory.cpp b/TAO/tao/Storable_Factory.cpp index 624f7200e00..41b99d0dbc1 100644 --- a/TAO/tao/Storable_Factory.cpp +++ b/TAO/tao/Storable_Factory.cpp @@ -12,11 +12,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO::Storable_Factory::Storable_Factory (void) +TAO::Storable_Factory::Storable_Factory () { } -TAO::Storable_Factory::~Storable_Factory (void) +TAO::Storable_Factory::~Storable_Factory () { } diff --git a/TAO/tao/Storable_File_Guard.cpp b/TAO/tao/Storable_File_Guard.cpp index 09a4b60f57e..b428fe67121 100644 --- a/TAO/tao/Storable_File_Guard.cpp +++ b/TAO/tao/Storable_File_Guard.cpp @@ -15,7 +15,7 @@ TAO::Storable_File_Guard:: Storable_File_Guard (bool redundant, bool use_backup) - : fl_(0) + : fl_(nullptr) , redundant_(redundant) , closed_(1) , rwflags_(0) @@ -69,7 +69,7 @@ TAO::Storable_File_Guard::init_no_load(Method_Type method_type) } void -TAO::Storable_File_Guard::reload (void) +TAO::Storable_File_Guard::reload () { if (redundant_) { @@ -145,21 +145,21 @@ TAO::Storable_File_Guard::init(Method_Type method_type) } bool -TAO::Storable_File_Guard::object_obsolete (void) +TAO::Storable_File_Guard::object_obsolete () { // Default implementation uses time to determine // if obsolete. return (fl_->last_changed () > this->get_object_last_changed ()); } void -TAO::Storable_File_Guard::mark_object_current (void) +TAO::Storable_File_Guard::mark_object_current () { // Default implementation is to set the last changed // time to that of the file lock. this->set_object_last_changed (fl_->last_changed ()); } void -TAO::Storable_File_Guard::release (void) +TAO::Storable_File_Guard::release () { if ( ! closed_ ) { diff --git a/TAO/tao/Storable_FlatFileStream.cpp b/TAO/tao/Storable_FlatFileStream.cpp index a95c5063fc0..2cb1951cc3a 100644 --- a/TAO/tao/Storable_FlatFileStream.cpp +++ b/TAO/tao/Storable_FlatFileStream.cpp @@ -41,7 +41,7 @@ namespace char buf[BUFSIZ]; char * result = fgets (buf, BUFSIZ, fl); - if (result == 0) + if (result == nullptr) { if (feof (fl)) { @@ -59,7 +59,7 @@ namespace result = fgets (buf, BUFSIZ, fl); } - if (result == 0) + if (result == nullptr) { if (feof (fl)) { @@ -131,18 +131,18 @@ TAO::Storable_FlatFileStream::Storable_FlatFileStream (const ACE_CString & file, bool retry_on_ebadf) : Storable_Base(use_backup, retry_on_ebadf) , filelock_ () - , fl_ (0) + , fl_ (nullptr) , file_(file) , mode_(mode) { // filelock_ will be completely initialized in call to init (). filelock_.handle_ = ACE_INVALID_HANDLE; - filelock_.lockname_ = 0; + filelock_.lockname_ = nullptr; } TAO::Storable_FlatFileStream::~Storable_FlatFileStream () { - if ( fl_ != 0 ) + if ( fl_ != nullptr ) this->close(); } @@ -178,7 +178,7 @@ TAO::Storable_FlatFileStream::open() { // For now, three flags exist "r", "w", and "c" int flags = 0; - const char *fdmode = 0; + const char *fdmode = nullptr; if( ACE_OS::strchr(mode_.c_str(), 'r') ) if( ACE_OS::strchr(mode_.c_str(), 'w') ) flags = O_RDWR, fdmode = "w+"; @@ -206,14 +206,14 @@ TAO::Storable_FlatFileStream::open() -1); #endif - this->fl_ = 0; + this->fl_ = nullptr; for (int attempts = this->retry_on_ebadf_ ? 2 : 1; - attempts > 0 && this->fl_ == 0; + attempts > 0 && this->fl_ == nullptr; attempts--) { this->fl_ = ACE_OS::fdopen(filelock_.handle_, ACE_TEXT_CHAR_TO_TCHAR (fdmode)); - if (this->fl_ == 0) + if (this->fl_ == nullptr) { if (TAO_debug_level > 0) { @@ -228,7 +228,7 @@ TAO::Storable_FlatFileStream::open() } } } - return this->fl_ == 0 ? -1 : 0; + return this->fl_ == nullptr ? -1 : 0; } int @@ -241,7 +241,7 @@ TAO::Storable_FlatFileStream::close() ACE_OS::fclose (fl_); // even though flock_destroy closes the handle // we still need to destroy the FILE* - fl_ = 0; + fl_ = nullptr; return 0; } @@ -331,7 +331,7 @@ TAO::Storable_FlatFileStream::funlock (int whence, int start, int len) } time_t -TAO::Storable_FlatFileStream::last_changed(void) +TAO::Storable_FlatFileStream::last_changed() { ACE_stat st; int result = 0; @@ -384,19 +384,19 @@ TAO::Storable_FlatFileStream::last_changed(void) } void -TAO::Storable_FlatFileStream::rewind (void) +TAO::Storable_FlatFileStream::rewind () { ACE_OS::rewind(this->fl_); } bool -TAO::Storable_FlatFileStream::flush (void) +TAO::Storable_FlatFileStream::flush () { return ACE_OS::fflush(this->fl_); } int -TAO::Storable_FlatFileStream::sync (void) +TAO::Storable_FlatFileStream::sync () { return ACE_OS::fsync (this->filelock_.handle_); } @@ -441,12 +441,12 @@ TAO::Storable_FlatFileStream::operator >> (ACE_CString& str) str_array[0] = '\0'; if (ACE_OS::fgets (str_array.get (), strSize, - this->fl_) == 0 + this->fl_) == nullptr && bufSize != 0) { this->throw_on_read_error (badbit); } - str = ACE_CString (str_array.get (), 0, false); + str = ACE_CString (str_array.get (), nullptr, false); } return *this; @@ -539,7 +539,7 @@ TAO::Storable_FlatFileStream::operator << (const TAO_OutputCDR & cdr) unsigned int const length = ACE_Utils::truncate_cast<unsigned int> (cdr.total_length ()); *this << length; - for (const ACE_Message_Block *i = cdr.begin (); i != 0; i = i->cont ()) + for (const ACE_Message_Block *i = cdr.begin (); i != nullptr; i = i->cont ()) { const char *bytes = i->rd_ptr (); size_t const len = i->length (); @@ -569,7 +569,7 @@ TAO::Storable_FlatFileStream::backup_file_name () int TAO::Storable_FlatFileStream::create_backup () { - if (this->fl_ == 0) + if (this->fl_ == nullptr) { return 0; } @@ -634,7 +634,7 @@ TAO::Storable_FlatFileStream::restore_backup () if (ACE_OS::access (backup_name.c_str (), F_OK)) return -1; - if (ACE_OS::strchr (this->mode_.c_str(),'w') == 0) + if (ACE_OS::strchr (this->mode_.c_str(),'w') == nullptr) { this->mode_ += 'w'; } @@ -704,7 +704,7 @@ TAO::Storable_FlatFileFactory::is_nfs (const ACE_CString& directory) if (*dir != '/') { rpath[0] = 0; - if (ACE_OS::getcwd (rpath, PATH_MAX) == 0) + if (ACE_OS::getcwd (rpath, PATH_MAX) == nullptr) { if (TAO_debug_level > 0) { @@ -734,10 +734,10 @@ TAO::Storable_FlatFileFactory::is_nfs (const ACE_CString& directory) } size_t match = 0; size_t dirlen = ACE_OS::strlen(dir); - struct mntent *ent = 0; + struct mntent *ent = nullptr; const char *fname = "/etc/mtab"; FILE *mt = ::setmntent(fname,"r"); - if (mt == 0) + if (mt == nullptr) { if (TAO_debug_level > 0) { @@ -748,7 +748,7 @@ TAO::Storable_FlatFileFactory::is_nfs (const ACE_CString& directory) } return ret; } - while ((ent = ::getmntent(mt)) != 0) + while ((ent = ::getmntent(mt)) != nullptr) { size_t len = ACE_OS::strlen(ent->mnt_dir); @@ -788,14 +788,14 @@ TAO::Storable_FlatFileFactory::create_stream (const ACE_CString & file, const char * mode, bool ) { - TAO::Storable_Base *stream = 0; + TAO::Storable_Base *stream = nullptr; ACE_CString path = this->directory_ + "/" + file; ACE_NEW_RETURN (stream, TAO::Storable_FlatFileStream(path, mode, this->use_backup_, this->retry_on_ebadf_), - 0); + nullptr); return stream; } diff --git a/TAO/tao/Strategies/COIOP_Profile.h b/TAO/tao/Strategies/COIOP_Profile.h index 3a32e5e2c00..3ee737d614b 100644 --- a/TAO/tao/Strategies/COIOP_Profile.h +++ b/TAO/tao/Strategies/COIOP_Profile.h @@ -79,8 +79,7 @@ protected: /// Template methods. Please see tao/Profile.h for documentation. virtual int decode_profile (TAO_InputCDR& cdr); - virtual void parse_string_i (const char *string - ); + virtual void parse_string_i (const char *string); virtual void create_profile_body (TAO_OutputCDR &cdr) const; virtual int decode_endpoints (void); virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile); diff --git a/TAO/tao/Strategies/DIOP_Acceptor.cpp b/TAO/tao/Strategies/DIOP_Acceptor.cpp index 166d0222916..0053c012e61 100644 --- a/TAO/tao/Strategies/DIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/DIOP_Acceptor.cpp @@ -219,7 +219,7 @@ TAO_DIOP_Acceptor::is_collocated (const TAO_Endpoint *endpoint) // this code by comparing the IP address instead. That would // trigger the following bug: // - // http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1220 + // http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1220 // if (endp->port () == this->addrs_[i].get_port_number () && ACE_OS::strcmp (endp->host (), this->hosts_[i]) == 0) diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.cpp b/TAO/tao/Strategies/SCIOP_Acceptor.cpp index 65e10a506ff..028312365f0 100644 --- a/TAO/tao/Strategies/SCIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/SCIOP_Acceptor.cpp @@ -190,7 +190,7 @@ TAO_SCIOP_Acceptor::is_collocated (const TAO_Endpoint *endpoint) // this code by comparing the IP address instead. That would // trigger the following bug: // - // http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1220 + // http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1220 // if (endp->port() == this->addrs_[i].get_port_number() && ACE_OS::strcmp(endp->host(), this->hosts_[i]) == 0) @@ -525,7 +525,7 @@ TAO_SCIOP_Acceptor::open_i (const ACE_Multihomed_INET_Addr& addr, { ACE_Multihomed_INET_Addr a(addr); - int found_a_port = 0; + bool found_a_port = false; ACE_UINT32 last_port = requested_port + this->port_span_ - 1; if (last_port > ACE_MAX_DEFAULT_PORT) { @@ -547,13 +547,13 @@ TAO_SCIOP_Acceptor::open_i (const ACE_Multihomed_INET_Addr& addr, this->accept_strategy_, this->concurrency_strategy_) != -1) { - found_a_port = 1; + found_a_port = true; break; } } // Now, if we couldn't locate a port, we punt - if (! found_a_port) + if (!found_a_port) { if (TAO_debug_level > 0) TAOLIB_DEBUG ((LM_DEBUG, @@ -1000,7 +1000,7 @@ TAO_SCIOP_Acceptor::parse_options (const char *str) } else if (name == "portspan") { - int range = static_cast<int> (ACE_OS::atoi (value.c_str ())); + int const range = ACE_OS::atoi (value.c_str ()); // @@ What's the lower bound on the range? zero, or one? if (range < 1 || range > ACE_MAX_DEFAULT_PORT) TAOLIB_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.h b/TAO/tao/Strategies/SCIOP_Acceptor.h index d386e78f29e..ed76fe47c55 100644 --- a/TAO/tao/Strategies/SCIOP_Acceptor.h +++ b/TAO/tao/Strategies/SCIOP_Acceptor.h @@ -11,7 +11,6 @@ */ // =================================================================== - #ifndef TAO_SCIOP_ACCEPTOR_H #define TAO_SCIOP_ACCEPTOR_H #include /**/ "ace/pre.h" @@ -109,7 +108,6 @@ public: char *&host); protected: - /** * Implement the common part of the open*() methods. This method is * virtual to allow a derived class implementation to be invoked @@ -204,7 +202,6 @@ protected: TAO_ORB_Core *orb_core_; private: - /// the concrete acceptor, as a pointer to it's base class. TAO_SCIOP_BASE_ACCEPTOR base_acceptor_; @@ -212,7 +209,6 @@ private: TAO_SCIOP_CREATION_STRATEGY *creation_strategy_; TAO_SCIOP_CONCURRENCY_STRATEGY *concurrency_strategy_; TAO_SCIOP_ACCEPT_STRATEGY *accept_strategy_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/SCIOP_Profile.cpp b/TAO/tao/Strategies/SCIOP_Profile.cpp index dc81b03e23d..a5088c77aa5 100644 --- a/TAO/tao/Strategies/SCIOP_Profile.cpp +++ b/TAO/tao/Strategies/SCIOP_Profile.cpp @@ -132,8 +132,7 @@ TAO_SCIOP_Profile::decode_profile (TAO_InputCDR& cdr) } void -TAO_SCIOP_Profile::parse_string_i (const char *ior - ) +TAO_SCIOP_Profile::parse_string_i (const char *ior) { // Pull off the "hostname:port/" part of the objref // Copy the string because we are going to modify it... @@ -257,8 +256,7 @@ TAO_SCIOP_Profile::do_is_equivalent (const TAO_Profile *other_profile) } CORBA::ULong -TAO_SCIOP_Profile::hash (CORBA::ULong max - ) +TAO_SCIOP_Profile::hash (CORBA::ULong max) { // Get the hash value for all endpoints. CORBA::ULong hashval = 0; diff --git a/TAO/tao/Strategies/SCIOP_Profile.h b/TAO/tao/Strategies/SCIOP_Profile.h index 5b39d19758a..0b043b1784d 100644 --- a/TAO/tao/Strategies/SCIOP_Profile.h +++ b/TAO/tao/Strategies/SCIOP_Profile.h @@ -75,8 +75,7 @@ public: virtual int encode_endpoints (void); virtual TAO_Endpoint *endpoint (void); virtual CORBA::ULong endpoint_count (void) const; - virtual CORBA::ULong hash (CORBA::ULong max - ); + virtual CORBA::ULong hash (CORBA::ULong max); /** * Add <endp> to this profile's list of endpoints (it is inserted * next to the head of the list). This profiles takes ownership of @@ -89,8 +88,7 @@ protected: /// Template methods. Please see Profile.h for the documentation. virtual int decode_profile (TAO_InputCDR &cdr); virtual int decode_endpoints (void); - virtual void parse_string_i (const char *string - ); + virtual void parse_string_i (const char *string); virtual void create_profile_body (TAO_OutputCDR &cdr) const; virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile); diff --git a/TAO/tao/Strategies/SHMIOP_Profile.cpp b/TAO/tao/Strategies/SHMIOP_Profile.cpp index 17a3b19add8..7b43eb77f60 100644 --- a/TAO/tao/Strategies/SHMIOP_Profile.cpp +++ b/TAO/tao/Strategies/SHMIOP_Profile.cpp @@ -123,8 +123,7 @@ TAO_SHMIOP_Profile::decode_profile (TAO_InputCDR& cdr) } void -TAO_SHMIOP_Profile::parse_string_i (const char *string - ) +TAO_SHMIOP_Profile::parse_string_i (const char *string) { // Pull off the "hostname:port/" part of the objref // Copy the string because we are going to modify it... @@ -284,8 +283,7 @@ TAO_SHMIOP_Profile::do_is_equivalent (const TAO_Profile *other_profile) } CORBA::ULong -TAO_SHMIOP_Profile::hash (CORBA::ULong max - ) +TAO_SHMIOP_Profile::hash (CORBA::ULong max) { // Get the hashvalue for all endpoints. CORBA::ULong hashval = 0; diff --git a/TAO/tao/Strategies/SHMIOP_Profile.h b/TAO/tao/Strategies/SHMIOP_Profile.h index 3dce4c81f9c..666b5b633ba 100644 --- a/TAO/tao/Strategies/SHMIOP_Profile.h +++ b/TAO/tao/Strategies/SHMIOP_Profile.h @@ -78,8 +78,7 @@ public: virtual int encode_endpoints (void); virtual TAO_Endpoint *endpoint (void); virtual CORBA::ULong endpoint_count (void) const; - virtual CORBA::ULong hash (CORBA::ULong max - ); + virtual CORBA::ULong hash (CORBA::ULong max); /** * Add <endp> to this profile's list of endpoints (it is inserted * next to the head of the list). This profiles takes ownership of @@ -91,8 +90,7 @@ protected: /// Template methods. Please see tao/Profile.h for documentation. virtual int decode_profile (TAO_InputCDR& cdr); - virtual void parse_string_i (const char *string - ); + virtual void parse_string_i (const char *string); virtual void create_profile_body (TAO_OutputCDR &cdr) const; virtual int decode_endpoints (void); virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile); diff --git a/TAO/tao/Strategies/UIOP_Connector.h b/TAO/tao/Strategies/UIOP_Connector.h index b3cafb31e62..76a974e3498 100644 --- a/TAO/tao/Strategies/UIOP_Connector.h +++ b/TAO/tao/Strategies/UIOP_Connector.h @@ -69,8 +69,7 @@ public: virtual int check_prefix (const char *endpoint); - virtual TAO_Profile *corbaloc_scan (const char *str, size_t &len - ); + virtual TAO_Profile *corbaloc_scan (const char *str, size_t &len); virtual char object_key_delimiter (void) const; diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp index d2243029e0d..b4fdb54c24b 100644 --- a/TAO/tao/Strategies/advanced_resource.cpp +++ b/TAO/tao/Strategies/advanced_resource.cpp @@ -424,7 +424,6 @@ TAO_Advanced_Resource_Factory::allocate_reactor_impl (void) const // get a timer queue (or not) from a possibly configured // time policy TAO_RSF_Timer_Queue_Ptr tmq (*this, this->create_timer_queue ()); -//@@ TAO_ADVANCED_RESOURCE_REACTOR_SPL_COMMENT_HOOK_START switch (this->reactor_type_) { case TAO_REACTOR_SELECT_MT: @@ -496,8 +495,6 @@ TAO_Advanced_Resource_Factory::allocate_reactor_impl (void) const break; } -//@@ TAO_ADVANCED_RESOURCE_REACTOR_SPL_COMMENT_HOOK_END - // safe to release timer queue tmq.release (); return impl; diff --git a/TAO/tao/String_Alloc.cpp b/TAO/tao/String_Alloc.cpp index 7b6edfaac05..91935ce80a1 100644 --- a/TAO/tao/String_Alloc.cpp +++ b/TAO/tao/String_Alloc.cpp @@ -22,7 +22,7 @@ CORBA::string_dup (const char *str) if (!str) { errno = EINVAL; - return 0; + return nullptr; } #ifndef TAO_NO_SHARED_NULL_CORBA_STRING @@ -47,10 +47,10 @@ char * CORBA::string_alloc (CORBA::ULong len) { // Allocate 1 + strlen to accomodate the null terminating character. - char *s = 0; + char *s = nullptr; ACE_NEW_RETURN (s, char[size_t (len + 1)], - 0); + nullptr); s[0]= '\0'; return s; @@ -73,7 +73,7 @@ CORBA::wstring_dup (const WChar *const str) if (!str) { errno = EINVAL; - return 0; + return nullptr; } #ifndef TAO_NO_SHARED_NULL_CORBA_STRING @@ -83,10 +83,10 @@ CORBA::wstring_dup (const WChar *const str) CORBA::WChar* retval = CORBA::wstring_alloc (static_cast <CORBA::ULong> (ACE_OS::strlen (str))); - if (retval == 0) + if (retval == nullptr) { // The wscpy() below assumes that the destination is a valid buffer. - return 0; + return nullptr; } return ACE_OS::wscpy (retval, str); @@ -95,10 +95,10 @@ CORBA::wstring_dup (const WChar *const str) CORBA::WChar* CORBA::wstring_alloc (CORBA::ULong len) { - CORBA::WChar *s = 0; + CORBA::WChar *s = nullptr; ACE_NEW_RETURN (s, CORBA::WChar [(size_t) (len + 1)], - 0); + nullptr); return s; } diff --git a/TAO/tao/String_Const_Sequence_Element_T.h b/TAO/tao/String_Const_Sequence_Element_T.h index d9837cfdee1..d0a2d3c9f1d 100644 --- a/TAO/tao/String_Const_Sequence_Element_T.h +++ b/TAO/tao/String_Const_Sequence_Element_T.h @@ -51,7 +51,7 @@ public: return *this->element_; } - inline const character_type *in (void) const + inline const character_type *in () const { return *this->element_; } diff --git a/TAO/tao/String_Manager_T.h b/TAO/tao/String_Manager_T.h index 2a596187c52..9a0905bff57 100644 --- a/TAO/tao/String_Manager_T.h +++ b/TAO/tao/String_Manager_T.h @@ -39,7 +39,7 @@ public: typedef TAO::details::string_traits_base <charT> s_traits; /// Default CTOR will initialize the underlying ptr_ to empty string. - inline String_Manager_T (void) : ptr_ (s_traits::default_initializer()) + inline String_Manager_T () : ptr_ (s_traits::default_initializer()) { } @@ -56,7 +56,7 @@ public: } /// Destructor - inline ~String_Manager_T (void) { + inline ~String_Manager_T () { s_traits::release (this->ptr_); } @@ -101,24 +101,24 @@ public: } /// For in parameter. - inline const character_type *in (void) const { + inline const character_type *in () const { return this->ptr_; } /// For inout parameter. - inline character_type *&inout (void) { + inline character_type *&inout () { return this->ptr_; } /// for out parameter. - inline character_type *&out (void) { + inline character_type *&out () { s_traits::release (this->ptr_); this->ptr_ = 0; return this->ptr_; } /// For string of return type. - inline character_type *_retn (void) { + inline character_type *_retn () { character_type *temp = this->ptr_; this->ptr_ = 0; return temp; diff --git a/TAO/tao/String_Sequence_Element_T.h b/TAO/tao/String_Sequence_Element_T.h index b408e1c1685..1905bba57ad 100644 --- a/TAO/tao/String_Sequence_Element_T.h +++ b/TAO/tao/String_Sequence_Element_T.h @@ -96,15 +96,15 @@ public: return *this->element_; } - inline const character_type *in (void) const { + inline const character_type *in () const { return *this->element_; } - inline character_type *&inout (void) const { + inline character_type *&inout () const { return *this->element_; } - inline string_out out (void) const { + inline string_out out () const { if (release()) { @@ -114,7 +114,7 @@ public: return *this->element_; } - inline character_type *_retn (void) { + inline character_type *_retn () { character_type * copy = *this->element_; *this->element_ = traits::default_initializer(); return copy; diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp index 5f5a645e70e..c132daaeef9 100644 --- a/TAO/tao/Stub.cpp +++ b/TAO/tao/Stub.cpp @@ -35,23 +35,23 @@ TAO_Stub::TAO_Stub (const char *repository_id, , orb_ () , is_collocated_ (false) , servant_orb_ () - , collocated_servant_ (0) + , collocated_servant_ (nullptr) , object_proxy_broker_ (the_tao_remote_object_proxy_broker ()) , base_profiles_ ((CORBA::ULong) 0) - , forward_profiles_ (0) - , forward_profiles_perm_ (0) - , profile_in_use_ (0) + , forward_profiles_ (nullptr) + , forward_profiles_perm_ (nullptr) + , profile_in_use_ (nullptr) , profile_success_ (false) , refcount_ (1) #if (TAO_HAS_CORBA_MESSAGING == 1) - , policies_ (0) + , policies_ (nullptr) #endif - , ior_info_ (0) - , forwarded_ior_info_ (0) + , ior_info_ (nullptr) + , forwarded_ior_info_ (nullptr) , collocation_opt_ (orb_core->optimize_collocation_objects ()) , forwarded_on_exception_ (false) { - if (this->orb_core_.get() == 0) + if (this->orb_core_.get() == nullptr) { if (TAO_debug_level > 0) { @@ -79,7 +79,7 @@ TAO_Stub::TAO_Stub (const char *repository_id, this->base_profiles (profiles); } -TAO_Stub::~TAO_Stub (void) +TAO_Stub::~TAO_Stub () { ACE_ASSERT (this->refcount_ == 0); @@ -89,11 +89,11 @@ TAO_Stub::~TAO_Stub (void) // reset_profiles doesn't delete forward_profiles_perm_. delete this->forward_profiles_perm_; - if (this->profile_in_use_ != 0) + if (this->profile_in_use_ != nullptr) { // decrease reference count on profile this->profile_in_use_->_decr_refcnt (); - this->profile_in_use_ = 0; + this->profile_in_use_ = nullptr; } #if (TAO_HAS_CORBA_MESSAGING == 1) @@ -125,13 +125,13 @@ TAO_Stub::add_forward_profiles (const TAO_MProfile &mprofiles, if (permanent_forward) { // paranoid, reset the bookmark, then clear the forward-stack - this->forward_profiles_perm_ = 0; + this->forward_profiles_perm_ = nullptr; this->reset_forward (); } TAO_MProfile *now_pfiles = this->forward_profiles_; - if (now_pfiles == 0) + if (now_pfiles == nullptr) now_pfiles = &this->base_profiles_; ACE_NEW (this->forward_profiles_, @@ -175,11 +175,11 @@ TAO_Stub::create_ior_info (IOP::IOR *&ior_info, CORBA::ULong &index) } - IOP::IOR *tmp_info = 0; + IOP::IOR *tmp_info = nullptr; - if (this->forward_profiles_ != 0) + if (this->forward_profiles_ != nullptr) { - if (this->forwarded_ior_info_ == 0) + if (this->forwarded_ior_info_ == nullptr) { this->get_profile_ior_info (*this->forward_profiles_, tmp_info); @@ -203,7 +203,7 @@ TAO_Stub::create_ior_info (IOP::IOR *&ior_info, CORBA::ULong &index) } // Else we look at the base profiles - if (this->ior_info_ == 0) + if (this->ior_info_ == nullptr) { this->get_profile_ior_info (this->base_profiles_, tmp_info); @@ -228,7 +228,7 @@ TAO_Stub::create_ior_info (IOP::IOR *&ior_info, CORBA::ULong &index) } const TAO::ObjectKey & -TAO_Stub::object_key (void) const +TAO_Stub::object_key () const { // Return the profile in use's object key if you see one. if (this->profile_in_use_) @@ -242,7 +242,7 @@ TAO_Stub::object_key (void) const const_cast <TAO_SYNCH_MUTEX&>(this->profile_lock_)); // FUZZ: enable check_for_ACE_Guard - if (obj.locked () != 0 && this->forward_profiles_ != 0) + if (obj.locked () != 0 && this->forward_profiles_ != nullptr) return this->forward_profiles_->get_profile (0)->object_key (); } @@ -271,7 +271,7 @@ TAO_Stub::get_profile_ior_info (TAO_MProfile &profiles, IOP::IOR *&ior_info) IOP::TaggedProfile *tp = prof->create_tagged_profile (); - if (tp == 0) + if (tp == nullptr) throw ::CORBA::NO_MEMORY (); ior_info->profiles[index] = *tp; } @@ -285,7 +285,7 @@ TAO_Stub::is_collocated (CORBA::Boolean collocated) if (this->is_collocated_ != collocated) { if (collocated && - _TAO_Object_Proxy_Broker_Factory_function_pointer != 0) + _TAO_Object_Proxy_Broker_Factory_function_pointer != nullptr) { this->object_proxy_broker_ = _TAO_Object_Proxy_Broker_Factory_function_pointer (); @@ -327,7 +327,7 @@ TAO_Stub::is_equivalent (CORBA::Object_ptr other_obj) TAO_Profile * const other_profile = other_obj->_stubobj ()->profile_in_use_; TAO_Profile * const this_profile = this->profile_in_use_; - if (other_profile == 0 || this_profile == 0) + if (other_profile == nullptr || this_profile == nullptr) return false; // Compare the profiles @@ -359,7 +359,7 @@ TAO_Stub::set_profile_in_use_i (TAO_Profile *pfile) } void -TAO_Stub::forward_back_one (void) +TAO_Stub::forward_back_one () { TAO_MProfile *from = forward_profiles_->forward_from (); @@ -371,12 +371,12 @@ TAO_Stub::forward_back_one (void) // longer being forwarded, so set the reference to zero. if (from == &this->base_profiles_) { - this->base_profiles_.get_current_profile ()->forward_to (0); - this->forward_profiles_ = 0; + this->base_profiles_.get_current_profile ()->forward_to (nullptr); + this->forward_profiles_ = nullptr; } else { - from->get_current_profile ()->forward_to (0); + from->get_current_profile ()->forward_to (nullptr); this->forward_profiles_ = from; } } @@ -418,7 +418,7 @@ TAO_Stub::get_policy (CORBA::PolicyType type) // construction time... CORBA::Policy_var result; - if (this->policies_ != 0) + if (this->policies_ != nullptr) { result = this->policies_->get_policy (type); } @@ -438,7 +438,7 @@ TAO_Stub::get_cached_policy (TAO_Cached_Policy_Type type) // construction time... CORBA::Policy_var result; - if (this->policies_ != 0) + if (this->policies_ != nullptr) { result = this->policies_->get_cached_policy (type); } @@ -456,17 +456,13 @@ TAO_Stub::set_policy_overrides (const CORBA::PolicyList & policies, CORBA::SetOverrideType set_add) { // Notice the use of an explicit constructor.... -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO_Policy_Set> policy_manager (new TAO_Policy_Set (TAO_POLICY_OBJECT_SCOPE)); -#else - auto_ptr<TAO_Policy_Set> policy_manager (new TAO_Policy_Set (TAO_POLICY_OBJECT_SCOPE)); -#endif /* ACE_HAS_CPP11 */ if (set_add == CORBA::SET_OVERRIDE) { policy_manager->set_policy_overrides (policies, set_add); } - else if (this->policies_ == 0) + else if (this->policies_ == nullptr) { policy_manager->set_policy_overrides (policies, CORBA::SET_OVERRIDE); } @@ -491,9 +487,9 @@ TAO_Stub::set_policy_overrides (const CORBA::PolicyList & policies, CORBA::PolicyList * TAO_Stub::get_policy_overrides (const CORBA::PolicyTypeSeq &types) { - if (this->policies_ == 0) + if (this->policies_ == nullptr) { - CORBA::PolicyList *policy_list_ptr = 0; + CORBA::PolicyList *policy_list_ptr = nullptr; ACE_NEW_THROW_EX (policy_list_ptr, CORBA::PolicyList (), CORBA::NO_MEMORY ()); @@ -548,7 +544,7 @@ TAO_Stub::marshal (TAO_OutputCDR &cdr) } - ACE_ASSERT(this->forward_profiles_ !=0); + ACE_ASSERT(this->forward_profiles_ !=nullptr); // paranoid - in case of FT the basic_profiles_ would do, too, // but might be dated diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h index a2b56708493..de3020ed58c 100644 --- a/TAO/tao/Stub.h +++ b/TAO/tao/Stub.h @@ -22,11 +22,7 @@ #include "tao/MProfile.h" #include "tao/ORB_Core_Auto_Ptr.h" -#if defined (ACE_HAS_CPP11) -# include <atomic> -#else -# include "ace/Atomic_Op.h" -#endif /* ACE_HAS_CPP11 */ +#include <atomic> #if defined (HPUX) && defined (IOR) /* HP-UX 11.11 defines IOR in /usr/include/pa/inline.h @@ -89,7 +85,7 @@ public: /// Return the queueing strategy to be used in by the transport. /// Selection will be based on the SyncScope policies. - TAO::Transport_Queueing_Strategy *transport_queueing_strategy (void); + TAO::Transport_Queueing_Strategy *transport_queueing_strategy (); /// All objref representations carry around a type ID. CORBA::String_var type_id; @@ -114,39 +110,39 @@ public: TAO_ORB_Core *orb_core); // = Memory management. - void _incr_refcnt (void); - void _decr_refcnt (void); + void _incr_refcnt (); + void _decr_refcnt (); /// Return the Profile lock. This lock can be used at places where /// profiles need to be edited. - const TAO_SYNCH_MUTEX& profile_lock (void) const; + const TAO_SYNCH_MUTEX& profile_lock () const; /// Manage the base (non-forwarded) profiles. /// Returns a pointer to the profile_in_use object. This object /// retains ownership of this profile. - TAO_Profile *profile_in_use (void); + TAO_Profile *profile_in_use (); /// Return the ObjectKey - const TAO::ObjectKey &object_key (void) const; + const TAO::ObjectKey &object_key () const; /** * Copy of the profile list, user must free memory when done. * although the user can call make_profiles() then reorder * the list and give it back to TAO_Stub. */ - TAO_MProfile *make_profiles (void); + TAO_MProfile *make_profiles (); /// Obtain a reference to the basic profile set. - const TAO_MProfile& base_profiles (void) const; + const TAO_MProfile& base_profiles () const; /// Obtain a reference to the basic profile set. - TAO_MProfile& base_profiles (void); + TAO_MProfile& base_profiles (); /// Obtain a pointer to the forwarded profile set - const TAO_MProfile *forward_profiles (void) const; + const TAO_MProfile *forward_profiles () const; /// Obtain a pointer to the forwarded profile set - TAO_MProfile *forward_profiles (void); + TAO_MProfile *forward_profiles (); /// True if permanent location forward occurred, in this case the lock must be set and the @@ -159,7 +155,7 @@ public: * profile_in_use_ is set to the first profile in the base_profiles * list. */ - TAO_Profile *next_profile (void); + TAO_Profile *next_profile (); /** * THREAD SAFE @@ -167,23 +163,23 @@ public: * profile and if there are anmy existing forward profiles they are * reset. */ - void reset_profiles (void); + void reset_profiles (); /// Returns true if the profile in use is /// the same as the profile in use after /// reset_profiles() is called. - CORBA::Boolean at_starting_profile (void) const; + CORBA::Boolean at_starting_profile () const; /// Returns true if a forward profile has successfully been used. /// profile_success_ && forward_profiles_ - CORBA::Boolean valid_forward_profile (void); + CORBA::Boolean valid_forward_profile (); /// NON-THREAD-SAFE. Will set profile_success_ to true. - void set_valid_profile (void); + void set_valid_profile (); /// Returns true if a connection was successful with at least /// one profile. - CORBA::Boolean valid_profile (void) const; + CORBA::Boolean valid_profile () const; /// Initialize the base_profiles_ and set profile_in_use_ to /// reference the first profile. @@ -207,22 +203,22 @@ public: * Used to get the next profile after the one being used has * failed during the initial connect or send of the message! */ - CORBA::Boolean next_profile_retry (void); + CORBA::Boolean next_profile_retry (); /// Accessor. - TAO_ORB_Core* orb_core (void) const; + TAO_ORB_Core* orb_core () const; /// Is this stub collocated with the servant? - CORBA::Boolean is_collocated (void) const; + CORBA::Boolean is_collocated () const; /// Mutator to mark this stub as being collocated with the servant. void is_collocated (CORBA::Boolean); /// This returns a duplicated ORB pointer. - CORBA::ORB_ptr servant_orb_ptr (void); + CORBA::ORB_ptr servant_orb_ptr (); /// This returns the ORB var itself (generally for temporary use). - CORBA::ORB_var &servant_orb_var (void); + CORBA::ORB_var &servant_orb_var (); /** * Accesor and mutator for the servant ORB. Notice that the mutator @@ -236,7 +232,7 @@ public: void collocated_servant (TAO_Abstract_ServantBase* servant); /// Accessor for the servant reference in collocated cases. - TAO_Abstract_ServantBase* collocated_servant (void) const; + TAO_Abstract_ServantBase* collocated_servant () const; /// Mutator for setting the object proxy broker pointer. /// CORBA::Objects using this stub will use this for standard calls @@ -246,7 +242,7 @@ public: /// Accessor for getting the object proxy broker pointer. /// CORBA::Objects using this stub use this for standard calls /// like is_a; get_interface; etc... - TAO::Object_Proxy_Broker *object_proxy_broker (void) const; + TAO::Object_Proxy_Broker *object_proxy_broker () const; /** * Create the IOP::IOR info. We will create the info at most once. @@ -259,14 +255,14 @@ public: * This method is intended to be used only by the CORBA::Object * class. */ - void destroy (void); + void destroy (); /// Return the cached value from the ORB_Core. /** * This flag indicates whether the stub code should make use of the * collocation opportunities that are available to the ORB. */ - CORBA::Boolean optimize_collocation_objects (void) const; + CORBA::Boolean optimize_collocation_objects () const; /// Needed to avoid copying forward_profiles for thread safety CORBA::Boolean marshal (TAO_OutputCDR&); @@ -278,13 +274,13 @@ protected: /// Destructor is to be called only through _decr_refcnt() to /// enforce proper reference counting. - virtual ~TAO_Stub (void); + virtual ~TAO_Stub (); /// NON-THREAD SAFE version of reset_profiles (void); - void reset_profiles_i (void); + void reset_profiles_i (); /// NON-THREAD SAFE version of next_profile (void) - TAO_Profile *next_profile_i (void); + TAO_Profile *next_profile_i (); private: /// Makes a copy of the profile and frees the existing profile_in_use. @@ -297,14 +293,14 @@ private: /// NON-THREAD-SAFE. Utility method which unrolls (removes or pops) /// the top most forwarding profile list. - void forward_back_one (void); + void forward_back_one (); /// NOT THREAD-SAFE. Utility method which pops all forward profile /// lists and resets the forward_profiles_ pointer. void reset_forward (); /// NON-THREAD-SAFE. utility method for next_profile. - TAO_Profile *next_forward_profile (void); + TAO_Profile *next_forward_profile (); /// THREAD-SAFE Create the IOR info int get_profile_ior_info (TAO_MProfile &profile, IOP::IOR *&ior_info); @@ -384,11 +380,7 @@ protected: CORBA::Boolean profile_success_; /// Reference counter. -#if defined (ACE_HAS_CPP11) std::atomic<uint32_t> refcount_; -#else - ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; -#endif /* ACE_HAS_CPP11 */ /// The policy overrides in this object, if nil then use the default /// policies. @@ -418,7 +410,7 @@ protected: /// True if forwarding request upon some specific exceptions /// (e.g. OBJECT_NOT_EXIST) already happened. - ACE_Atomic_Op<TAO_SYNCH_MUTEX, bool> forwarded_on_exception_; + std::atomic<bool> forwarded_on_exception_; }; // Define a TAO_Stub auto_ptr class. @@ -434,12 +426,12 @@ public: explicit TAO_Stub_Auto_Ptr (TAO_Stub *p = 0); TAO_Stub_Auto_Ptr (TAO_Stub_Auto_Ptr &ap); TAO_Stub_Auto_Ptr &operator= (TAO_Stub_Auto_Ptr &rhs); - ~TAO_Stub_Auto_Ptr (void); + ~TAO_Stub_Auto_Ptr (); // = Accessor methods. TAO_Stub &operator *() const; - TAO_Stub *get (void) const; - TAO_Stub *release (void); + TAO_Stub *get () const; + TAO_Stub *release (); void reset (TAO_Stub *p = 0); TAO_Stub *operator-> () const; diff --git a/TAO/tao/Stub.inl b/TAO/tao/Stub.inl index 7c638ccf206..146414ac160 100644 --- a/TAO/tao/Stub.inl +++ b/TAO/tao/Stub.inl @@ -393,7 +393,7 @@ void TAO_Stub::forwarded_on_exception (bool forwarded) ACE_INLINE bool TAO_Stub::forwarded_on_exception () const { - return forwarded_on_exception_.value (); + return forwarded_on_exception_; } ACE_INLINE diff --git a/TAO/tao/Stub_Factory.cpp b/TAO/tao/Stub_Factory.cpp index 7a29fd40e4d..e6ac07d53a6 100644 --- a/TAO/tao/Stub_Factory.cpp +++ b/TAO/tao/Stub_Factory.cpp @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Stub_Factory::~TAO_Stub_Factory (void) +TAO_Stub_Factory::~TAO_Stub_Factory () { } diff --git a/TAO/tao/Synch_Invocation.cpp b/TAO/tao/Synch_Invocation.cpp index 6e1c38b22e9..ee073e085d3 100644 --- a/TAO/tao/Synch_Invocation.cpp +++ b/TAO/tao/Synch_Invocation.cpp @@ -75,7 +75,7 @@ namespace TAO resolver, detail, response_expected) - , retry_state_ (0) + , retry_state_ (nullptr) { } @@ -90,7 +90,7 @@ namespace TAO { TAO::ORB_Countdown_Time countdown (max_wait_time); - TAO_Synch_Reply_Dispatcher *rd_p = 0; + TAO_Synch_Reply_Dispatcher *rd_p = nullptr; ACE_NEW_NORETURN (rd_p, TAO_Synch_Reply_Dispatcher (this->resolver_.stub ()->orb_core (), this->details_.reply_service_info ())); if (!rd_p) @@ -398,7 +398,7 @@ namespace TAO } catch (const ::CORBA::Exception&) { - if (this->retry_state_ == 0 || + if (this->retry_state_ == nullptr || !this->retry_state_->forward_on_exception_limit_used ()) { this->resolver_.stub ()->reset_profiles (); @@ -426,7 +426,7 @@ namespace TAO TAO_InputCDR &cdr = rd.reply_cdr (); // Set the translators - this->resolver_.transport ()->assign_translators (&cdr, 0); + this->resolver_.transport ()->assign_translators (&cdr, nullptr); // At this point it can be assumed that the GIOP/whatever protocol // header and the reply header are already handled. Further it @@ -580,11 +580,7 @@ namespace TAO // We must manage the memory allocated // by the call above to alloc(). -#if defined (ACE_HAS_CPP11) std::unique_ptr<CORBA::Exception> safety (exception); -#else - auto_ptr<CORBA::Exception> safety (exception); -#endif /* ACE_HAS_CPP11 */ exception->_raise (); @@ -718,7 +714,7 @@ namespace TAO CORBA::SystemException *ex = TAO::create_system_exception (type_id.in ()); - if (ex == 0) + if (ex == nullptr) { // @@ We should raise a CORBA::NO_MEMORY, but we ran out // of memory already. We need a pre-allocated, TSS, @@ -731,11 +727,7 @@ namespace TAO // Without this, the call to create_system_exception() above // causes a memory leak. On platforms without native exceptions, // the CORBA::Environment class manages the memory. -#if defined (ACE_HAS_CPP11) std::unique_ptr<CORBA::SystemException> safety (ex); -#else - auto_ptr<CORBA::SystemException> safety (ex); -#endif /* ACE_HAS_CPP11 */ ex->minor (minor); ex->completed (CORBA::CompletionStatus (completion)); diff --git a/TAO/tao/Synch_Invocation.h b/TAO/tao/Synch_Invocation.h index 391955d8752..0637182898c 100644 --- a/TAO/tao/Synch_Invocation.h +++ b/TAO/tao/Synch_Invocation.h @@ -178,7 +178,7 @@ namespace TAO /// The destructor calls Invocation_Base::invoke_status with the /// right invoke status, which is useful for PI's. - ~Reply_Guard (void); + ~Reply_Guard (); /// Mutator to set the invocation status. void set_status (Invocation_Status s); diff --git a/TAO/tao/Synch_Invocation.inl b/TAO/tao/Synch_Invocation.inl index 607b714ce43..c595d17a7c0 100644 --- a/TAO/tao/Synch_Invocation.inl +++ b/TAO/tao/Synch_Invocation.inl @@ -12,7 +12,7 @@ namespace TAO } ACE_INLINE - Reply_Guard::~Reply_Guard (void) + Reply_Guard::~Reply_Guard () { #if TAO_HAS_INTERCEPTORS == 1 this->invocation_->invoke_status (this->status_); diff --git a/TAO/tao/Synch_Queued_Message.cpp b/TAO/tao/Synch_Queued_Message.cpp index f4ed2276cec..fb5122c0aea 100644 --- a/TAO/tao/Synch_Queued_Message.cpp +++ b/TAO/tao/Synch_Queued_Message.cpp @@ -20,24 +20,24 @@ TAO_Synch_Queued_Message::TAO_Synch_Queued_Message ( { } -TAO_Synch_Queued_Message::~TAO_Synch_Queued_Message (void) +TAO_Synch_Queued_Message::~TAO_Synch_Queued_Message () { - if (this->own_contents_ && this->contents_ != 0) + if (this->own_contents_ && this->contents_ != nullptr) { ACE_Message_Block::release (this->contents_); } } const ACE_Message_Block * -TAO_Synch_Queued_Message::current_block (void) const +TAO_Synch_Queued_Message::current_block () const { return this->current_block_; } size_t -TAO_Synch_Queued_Message::message_length (void) const +TAO_Synch_Queued_Message::message_length () const { - if (this->current_block_ == 0) + if (this->current_block_ == nullptr) { return 0; } @@ -46,9 +46,9 @@ TAO_Synch_Queued_Message::message_length (void) const } int -TAO_Synch_Queued_Message::all_data_sent (void) const +TAO_Synch_Queued_Message::all_data_sent () const { - return this->current_block_ == 0; + return this->current_block_ == nullptr; } void @@ -59,7 +59,7 @@ TAO_Synch_Queued_Message::fill_iov (int iovcnt_max, ACE_ASSERT (iovcnt_max > iovcnt); for (const ACE_Message_Block *message_block = this->current_block_; - message_block != 0 && iovcnt < iovcnt_max; + message_block != nullptr && iovcnt < iovcnt_max; message_block = message_block->cont ()) { size_t const message_block_length = message_block->length (); @@ -82,7 +82,7 @@ TAO_Synch_Queued_Message::bytes_transferred (size_t &byte_count) { this->state_changed_i (TAO_LF_Event::LFS_ACTIVE); - while (this->current_block_ != 0 && byte_count > 0) + while (this->current_block_ != nullptr && byte_count > 0) { size_t const l = this->current_block_->length (); @@ -97,14 +97,14 @@ TAO_Synch_Queued_Message::bytes_transferred (size_t &byte_count) this->current_block_->rd_ptr (l); this->current_block_ = this->current_block_->cont (); - while (this->current_block_ != 0 + while (this->current_block_ != nullptr && this->current_block_->length () == 0) { this->current_block_ = this->current_block_->cont (); } } - if (this->current_block_ == 0) + if (this->current_block_ == nullptr) this->state_changed (TAO_LF_Event::LFS_SUCCESS, this->orb_core_->leader_follower ()); } @@ -112,7 +112,7 @@ TAO_Synch_Queued_Message::bytes_transferred (size_t &byte_count) TAO_Queued_Message * TAO_Synch_Queued_Message::clone (ACE_Allocator *alloc) { - TAO_Synch_Queued_Message *qm = 0; + TAO_Synch_Queued_Message *qm = nullptr; // Clone the message block. // NOTE: We wantedly do the cloning from <current_block_> instead of @@ -130,26 +130,26 @@ TAO_Synch_Queued_Message::clone (ACE_Allocator *alloc) this->orb_core_, alloc, true), - 0); + nullptr); } else { ACE_NEW_RETURN (qm, - TAO_Synch_Queued_Message (mb, this->orb_core_, 0, true), - 0); + TAO_Synch_Queued_Message (mb, this->orb_core_, nullptr, true), + nullptr); } return qm; } void -TAO_Synch_Queued_Message::destroy (void) +TAO_Synch_Queued_Message::destroy () { if (this->own_contents_) { ACE_Message_Block::release (this->contents_); - this->current_block_ = 0; - this->contents_ = 0; + this->current_block_ = nullptr; + this->contents_ = nullptr; } if (this->is_heap_created_) @@ -176,7 +176,7 @@ TAO_Synch_Queued_Message::copy_if_necessary (const ACE_Message_Block* chain) { // Go through the message block chain looking for the message block // that matches our "current" message block. - for (const ACE_Message_Block* mb = chain; mb != 0; mb = mb->cont ()) + for (const ACE_Message_Block* mb = chain; mb != nullptr; mb = mb->cont ()) { if (mb == this->current_block_) { diff --git a/TAO/tao/Synch_Reply_Dispatcher.cpp b/TAO/tao/Synch_Reply_Dispatcher.cpp index 3043fd45ce0..a63bcad601c 100644 --- a/TAO/tao/Synch_Reply_Dispatcher.cpp +++ b/TAO/tao/Synch_Reply_Dispatcher.cpp @@ -31,18 +31,18 @@ TAO_Synch_Reply_Dispatcher::TAO_Synch_Reply_Dispatcher ( } // Destructor. -TAO_Synch_Reply_Dispatcher::~TAO_Synch_Reply_Dispatcher (void) +TAO_Synch_Reply_Dispatcher::~TAO_Synch_Reply_Dispatcher () { } TAO_InputCDR & -TAO_Synch_Reply_Dispatcher::reply_cdr (void) +TAO_Synch_Reply_Dispatcher::reply_cdr () { return this->reply_cdr_; } void -TAO_Synch_Reply_Dispatcher::reply_timed_out (void) +TAO_Synch_Reply_Dispatcher::reply_timed_out () { // noop } @@ -51,7 +51,7 @@ int TAO_Synch_Reply_Dispatcher::dispatch_reply ( TAO_Pluggable_Reply_Params ¶ms) { - if (params.input_cdr_ == 0) + if (params.input_cdr_ == nullptr) return -1; this->reply_status_ = params.reply_status (); @@ -67,7 +67,7 @@ TAO_Synch_Reply_Dispatcher::dispatch_reply ( if (this->reply_service_info_.length() > 0) { orb_core_->service_context_registry (). - process_service_contexts (this->reply_service_info_, *(params.transport_), 0); + process_service_contexts (this->reply_service_info_, *(params.transport_), nullptr); } // Must reset the message state, it is possible that the same reply @@ -86,7 +86,7 @@ TAO_Synch_Reply_Dispatcher::dispatch_reply ( { ACE_Data_Block *db = this->reply_cdr_.clone_from (*params.input_cdr_); - if (db == 0) + if (db == nullptr) { if (TAO_debug_level > 2) { @@ -116,7 +116,7 @@ TAO_Synch_Reply_Dispatcher::dispatch_reply ( } void -TAO_Synch_Reply_Dispatcher::connection_closed (void) +TAO_Synch_Reply_Dispatcher::connection_closed () { this->state_changed (TAO_LF_Event::LFS_CONNECTION_CLOSED, this->orb_core_->leader_follower ()); diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp index d966dbd8b0b..7dc23aa3e40 100644 --- a/TAO/tao/SystemException.cpp +++ b/TAO/tao/SystemException.cpp @@ -55,7 +55,7 @@ const CORBA::ULong TAO_ENOTSUP_MINOR_CODE = 0x14U; // **************************************************************** -CORBA::SystemException::SystemException (void) +CORBA::SystemException::SystemException () : minor_ (0), completed_ (CORBA::COMPLETED_NO) { @@ -86,7 +86,7 @@ CORBA::SystemException::SystemException (const CORBA::SystemException &src) { } -CORBA::SystemException::~SystemException (void) +CORBA::SystemException::~SystemException () { } @@ -197,9 +197,9 @@ CORBA::SystemException::_tao_errno (int errno_value) } CORBA::Exception * -CORBA::SystemException::_tao_duplicate (void) const +CORBA::SystemException::_tao_duplicate () const { - return 0; + return nullptr; } CORBA::ULong @@ -220,7 +220,7 @@ CORBA::SystemException::_tao_print_system_exception (FILE *) const } ACE_CString -CORBA::SystemException::_info (void) const +CORBA::SystemException::_info () const { // @@ there are a few other "user exceptions" in the CORBA scope, // they're not all standard/system exceptions ... really need to @@ -241,7 +241,7 @@ CORBA::SystemException::_info (void) const if (VMCID == TAO::VMCID) { // @@ Move the following code to a subroutine, it is too long already! - const char *location = 0; + const char *location = nullptr; switch (this->minor () & 0x00000F80u) { case TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE: @@ -308,7 +308,7 @@ CORBA::SystemException::_info (void) const location = "unknown location"; } - const char *errno_indication = 0; + const char *errno_indication = nullptr; char unknown_errno [255]; CORBA::ULong minor_code = this->minor () & 0x7FU; switch (minor_code) @@ -410,7 +410,7 @@ CORBA::SystemException::_info (void) const { CORBA::ULong const minor_code = this->minor () & 0xFFFU; - const char *minor_description = 0; + const char *minor_description = nullptr; if (minor_code > 0) minor_description = @@ -697,133 +697,133 @@ CORBA::SystemException::_tao_get_omg_exception_description ( CORBA::UNKNOWN const * unknown_exception = dynamic_cast <const CORBA::UNKNOWN *> (&exc); - if (unknown_exception != 0 + if (unknown_exception != nullptr && minor_code < sizeof UNKNOWN_TABLE / sizeof (char *)) return UNKNOWN_TABLE[minor_code]; CORBA::BAD_PARAM const * bad_param__exception = dynamic_cast <const CORBA::BAD_PARAM *> (&exc); - if (bad_param__exception != 0 + if (bad_param__exception != nullptr && minor_code < sizeof BAD_PARAM_TABLE / sizeof (char *)) return BAD_PARAM_TABLE[minor_code]; CORBA::IMP_LIMIT const * imp_limit_exception = dynamic_cast <const CORBA::IMP_LIMIT *> (&exc); - if (imp_limit_exception != 0 + if (imp_limit_exception != nullptr && minor_code < sizeof IMP_LIMIT_TABLE / sizeof (char *)) return IMP_LIMIT_TABLE[minor_code]; CORBA::INITIALIZE const * initialize_exception = dynamic_cast <const CORBA::INITIALIZE *> (&exc); - if (initialize_exception != 0 + if (initialize_exception != nullptr && minor_code < sizeof INITIALIZE_TABLE / sizeof (char *)) return INITIALIZE_TABLE[minor_code]; CORBA::INV_OBJREF const * inv_objref_exception = dynamic_cast <const CORBA::INV_OBJREF *> (&exc); - if (inv_objref_exception != 0 + if (inv_objref_exception != nullptr && minor_code < sizeof INV_OBJREF_TABLE / sizeof (char *)) return INV_OBJREF_TABLE[minor_code]; CORBA::MARSHAL const * marshal_exception = dynamic_cast <const CORBA::MARSHAL *> (&exc); - if (marshal_exception != 0 + if (marshal_exception != nullptr && minor_code < sizeof MARSHAL_TABLE / sizeof (char *)) return MARSHAL_TABLE[minor_code]; CORBA::BAD_TYPECODE const * bad_typecode_exception = dynamic_cast <const CORBA::BAD_TYPECODE *> (&exc); - if (bad_typecode_exception != 0 + if (bad_typecode_exception != nullptr && minor_code < sizeof BAD_TYPECODE_TABLE / sizeof (char *)) return BAD_TYPECODE_TABLE[minor_code]; CORBA::NO_IMPLEMENT const * no_implement_exception = dynamic_cast <const CORBA::NO_IMPLEMENT *> (&exc); - if (no_implement_exception != 0 + if (no_implement_exception != nullptr && minor_code < sizeof NO_IMPLEMENT_TABLE / sizeof (char *)) return NO_IMPLEMENT_TABLE[minor_code]; CORBA::NO_RESOURCES const * no_resource_exception = dynamic_cast <const CORBA::NO_RESOURCES *> (&exc); - if (no_resource_exception != 0 + if (no_resource_exception != nullptr && minor_code < sizeof NO_RESOURCES_TABLE / sizeof (char *)) return NO_RESOURCES_TABLE[minor_code]; CORBA::BAD_INV_ORDER const * bad_inv_order_exception = dynamic_cast <const CORBA::BAD_INV_ORDER *> (&exc); - if (bad_inv_order_exception != 0 + if (bad_inv_order_exception != nullptr && minor_code < sizeof BAD_INV_ORDER_TABLE / sizeof (char *)) return BAD_INV_ORDER_TABLE[minor_code]; CORBA::TRANSIENT const * transient_exception = dynamic_cast <const CORBA::TRANSIENT *> (&exc); - if (transient_exception != 0 + if (transient_exception != nullptr && minor_code < sizeof TRANSIENT_TABLE / sizeof (char *)) return TRANSIENT_TABLE[minor_code]; CORBA::OBJ_ADAPTER const * obj_adapter_exception = dynamic_cast <const CORBA::OBJ_ADAPTER *> (&exc); - if (obj_adapter_exception != 0 + if (obj_adapter_exception != nullptr && minor_code < sizeof OBJ_ADAPTER_TABLE / sizeof (char *)) return OBJ_ADAPTER_TABLE[minor_code]; CORBA::DATA_CONVERSION const * data_conversion_exception = dynamic_cast <const CORBA::DATA_CONVERSION *> (&exc); - if (data_conversion_exception != 0 + if (data_conversion_exception != nullptr && minor_code < sizeof DATA_CONVERSION_TABLE / sizeof (char *)) return DATA_CONVERSION_TABLE[minor_code]; CORBA::OBJECT_NOT_EXIST const * object_not_exist_exception = dynamic_cast <const CORBA::OBJECT_NOT_EXIST *> (&exc); - if (object_not_exist_exception != 0 + if (object_not_exist_exception != nullptr && minor_code < sizeof OBJECT_NOT_EXIST_TABLE / sizeof (char *)) return OBJECT_NOT_EXIST_TABLE[minor_code]; CORBA::INV_POLICY const * inv_policy_exception = dynamic_cast <const CORBA::INV_POLICY *> (&exc); - if (inv_policy_exception != 0 + if (inv_policy_exception != nullptr && minor_code < sizeof INV_POLICY_TABLE / sizeof (char *)) return INV_POLICY_TABLE[minor_code]; CORBA::ACTIVITY_COMPLETED const * activity_completed_exception = dynamic_cast <const CORBA::ACTIVITY_COMPLETED *> (&exc); - if (activity_completed_exception != 0 + if (activity_completed_exception != nullptr && minor_code < sizeof ACTIVITY_COMPLETED_TABLE / sizeof (char *)) return ACTIVITY_COMPLETED_TABLE[minor_code]; CORBA::ACTIVITY_REQUIRED const * activity_required_exception = dynamic_cast <const CORBA::ACTIVITY_REQUIRED *> (&exc); - if (activity_required_exception != 0 + if (activity_required_exception != nullptr && minor_code < sizeof ACTIVITY_REQUIRED_TABLE / sizeof (char *)) return ACTIVITY_REQUIRED_TABLE[minor_code]; CORBA::BAD_OPERATION const * bad_operation_exception = dynamic_cast <const CORBA::BAD_OPERATION *> (&exc); - if (bad_operation_exception != 0 + if (bad_operation_exception != nullptr && minor_code < sizeof BAD_OPERATION_TABLE / sizeof (char *)) return BAD_OPERATION_TABLE[minor_code]; CORBA::BAD_CONTEXT const * bad_context_exception = dynamic_cast <const CORBA::BAD_CONTEXT *> (&exc); - if (bad_context_exception != 0 + if (bad_context_exception != nullptr && minor_code < sizeof BAD_CONTEXT_TABLE / sizeof (char *)) return BAD_CONTEXT_TABLE[minor_code]; CORBA::CODESET_INCOMPATIBLE const * codeset_incompatible_exception = dynamic_cast <const CORBA::CODESET_INCOMPATIBLE *> (&exc); - if (codeset_incompatible_exception != 0 + if (codeset_incompatible_exception != nullptr && minor_code < sizeof CODESET_INCOMPATIBLE_TABLE / sizeof (char *)) return CODESET_INCOMPATIBLE_TABLE[minor_code]; CORBA::INTF_REPOS const * intf_repos_exception = dynamic_cast <const CORBA::INTF_REPOS *> (&exc); - if (intf_repos_exception != 0 + if (intf_repos_exception != nullptr && minor_code < sizeof INTF_REPOS_TABLE / sizeof (char *)) return INTF_REPOS_TABLE[minor_code]; CORBA::TIMEOUT const * timeout_exception = dynamic_cast <const CORBA::TIMEOUT *> (&exc); - if (timeout_exception != 0 + if (timeout_exception != nullptr && minor_code < sizeof TIMEOUT_TABLE / sizeof (char *)) return TIMEOUT_TABLE[minor_code]; @@ -893,7 +893,7 @@ static const char *repo_id_array[] = { (char *) "IDL:omg.org/CORBA/" #name ":1.0", STANDARD_EXCEPTION_LIST #undef TAO_SYSTEM_EXCEPTION - 0 + nullptr }; // Since we add an extra element subtract 1 @@ -907,7 +907,7 @@ TAO::excp_factory excp_array [] = { &CORBA::name::_tao_create, STANDARD_EXCEPTION_LIST #undef TAO_SYSTEM_EXCEPTION - 0 + nullptr }; // Concrete SystemException constructors @@ -963,7 +963,7 @@ TAO::create_system_exception (const char *id) return (*(excp_array[i])) (); } - return 0; + return nullptr; } #define TAO_SYSTEM_EXCEPTION(name) \ diff --git a/TAO/tao/SystemException.h b/TAO/tao/SystemException.h index 9a1da6ec170..f52e0414820 100644 --- a/TAO/tao/SystemException.h +++ b/TAO/tao/SystemException.h @@ -27,13 +27,9 @@ #include "tao/Exception.h" #ifndef TAO_Exception_Export -# if (__GNUC__ > 3) -// Exceptions found in DLL A but potentially thrown in DLL B must -// always be exported. # define TAO_Exception_Export ACE_Proper_Export_Flag # else # define TAO_Exception_Export TAO_Export -# endif /* __GNUC__ > 3*/ #endif /* !TAO_Exception_Export */ #ifdef THREAD_CANCELLED @@ -59,7 +55,7 @@ namespace CORBA namespace TAO { - typedef CORBA::SystemException* (*excp_factory)(void); + typedef CORBA::SystemException* (*excp_factory)(); } namespace CORBA @@ -103,16 +99,16 @@ namespace CORBA SystemException (const SystemException & src); /// Destructor. - virtual ~SystemException (void); + virtual ~SystemException (); /// Get the minor status. - ULong minor (void) const; + ULong minor () const; /// Set the minor status. void minor (ULong m); /// Get the completion status. - CORBA::CompletionStatus completed (void) const; + CORBA::CompletionStatus completed () const; /// Set the operation completion status. void completed (CORBA::CompletionStatus c); @@ -123,7 +119,7 @@ namespace CORBA /// The const version of narrow operation to a SystemException static const SystemException *_downcast(const CORBA::Exception *exception); - virtual void _raise (void) const = 0; + virtual void _raise () const = 0; // = TAO-specific extension. @@ -133,7 +129,7 @@ namespace CORBA /// Returns a string containing information about the exception. This /// function is not CORBA compliant. - virtual ACE_CString _info (void) const; + virtual ACE_CString _info () const; virtual void _tao_encode (TAO_OutputCDR &cdr) const; @@ -147,12 +143,12 @@ namespace CORBA static CORBA::ULong _tao_errno (int errno_value); /// Deep copy - virtual CORBA::Exception *_tao_duplicate (void) const; + virtual CORBA::Exception *_tao_duplicate () const; protected: /// Default constructor. - SystemException (void); + SystemException (); /// Assignment operator. SystemException & operator= (const SystemException &src); diff --git a/TAO/tao/System_Time_Policy_Strategy.cpp b/TAO/tao/System_Time_Policy_Strategy.cpp index 30255432059..7f72324b906 100644 --- a/TAO/tao/System_Time_Policy_Strategy.cpp +++ b/TAO/tao/System_Time_Policy_Strategy.cpp @@ -13,15 +13,15 @@ TAO_System_Time_Policy_Strategy::~TAO_System_Time_Policy_Strategy () { } -ACE_Timer_Queue * TAO_System_Time_Policy_Strategy::create_timer_queue (void) +ACE_Timer_Queue * TAO_System_Time_Policy_Strategy::create_timer_queue () { - ACE_Timer_Queue * tmq = 0; + ACE_Timer_Queue * tmq = nullptr; typedef ACE_Timer_Heap_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall, ACE_SYNCH_RECURSIVE_MUTEX, ACE_System_Time_Policy> timer_queue_type; - ACE_NEW_RETURN (tmq, timer_queue_type (), 0); + ACE_NEW_RETURN (tmq, timer_queue_type (), nullptr); return tmq; } @@ -32,7 +32,7 @@ TAO_System_Time_Policy_Strategy::destroy_timer_queue (ACE_Timer_Queue *tmq) delete tmq; } -ACE_Dynamic_Time_Policy_Base * TAO_System_Time_Policy_Strategy::get_time_policy (void) +ACE_Dynamic_Time_Policy_Base * TAO_System_Time_Policy_Strategy::get_time_policy () { return &time_policy_; } diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp index 9e324aec423..2bdb10bdcbe 100644 --- a/TAO/tao/TAO_Internal.cpp +++ b/TAO/tao/TAO_Internal.cpp @@ -191,13 +191,13 @@ class TAO_Ubergestalt_Ready_Condition : public ACE_SYNCH_RECURSIVE_CONDITION { public: - static TAO_Ubergestalt_Ready_Condition* instance (void) + static TAO_Ubergestalt_Ready_Condition* instance () { return TAO_Singleton <TAO_Ubergestalt_Ready_Condition, TAO_SYNCH_RECURSIVE_MUTEX>::instance (); } - TAO_Ubergestalt_Ready_Condition (void) + TAO_Ubergestalt_Ready_Condition () : ACE_SYNCH_RECURSIVE_CONDITION (mutex_) { } @@ -260,7 +260,7 @@ TAO::ORB::open_global_services (int argc, ACE_TCHAR **argv) // has something to skip! ACE_ARGV global_svc_config_argv (true); // only this ctor allows // subsequent use of add()! - global_svc_config_argv.add ((argc <= 0 || argv == 0) ? + global_svc_config_argv.add ((argc <= 0 || argv == nullptr) ? ACE_TEXT ("") : argv[0], true); // Will expand the environment variables, if any were used. @@ -428,7 +428,7 @@ TAO::ORB::open_services (ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> pcfg, // has something to skip! ACE_ARGV svc_config_argv (true); // only this ctor allows subsequent // use of add()! - svc_config_argv.add ((argc <= 0 || argv == 0) ? ACE_TEXT ("") : argv[0], + svc_config_argv.add ((argc <= 0 || argv == nullptr) ? ACE_TEXT ("") : argv[0], true); // Should we skip the ACE_Service_Config::open() method?, @@ -587,7 +587,7 @@ namespace return pcfg->open (command_line.get_argc (), command_line.get_TCHAR_argv (), - 0, + nullptr, false, // Don't ignore static services. ignore_default_svc_conf_file); } @@ -606,7 +606,7 @@ namespace ACE_Dynamic_Service<TAO_Codeset_Manager_Factory_Base>::instance ( "TAO_Codeset"); - if (factory == 0 || factory->is_default ()) + if (factory == nullptr || factory->is_default ()) { #if !defined (TAO_AS_STATIC_LIBS) && !(defined (ACE_VXWORKS) && !defined (__RTP__)) // only for dynamic libs, check to see if default factory @@ -629,7 +629,7 @@ namespace #endif /* !TAO_AS_STATIC_LIBS && !(ACE_VXWORKS && !__RTP__) */ } - if (factory == 0) + if (factory == nullptr) { if (TAO_debug_level > 0) { @@ -703,19 +703,19 @@ namespace // @@ They are needed for platforms that have no file system, // like VxWorks. - if (resource_factory_args != 0) + if (resource_factory_args != nullptr) { pcfg->process_directive( ACE_TEXT_CHAR_TO_TCHAR (resource_factory_args)); } - if (client_strategy_factory_args != 0) + if (client_strategy_factory_args != nullptr) { pcfg->process_directive (ACE_TEXT_CHAR_TO_TCHAR (client_strategy_factory_args)); } - if (server_strategy_factory_args != 0) + if (server_strategy_factory_args != nullptr) { pcfg->process_directive (ACE_TEXT_CHAR_TO_TCHAR (server_strategy_factory_args)); @@ -726,9 +726,9 @@ namespace pcfg, "PI_Server_Loader"); - if (pi_server_loader != 0) + if (pi_server_loader != nullptr) { - pi_server_loader->init (0, 0); + pi_server_loader->init (0, nullptr); } ACE_Service_Object * const bidir_loader = @@ -736,9 +736,9 @@ namespace pcfg, "BiDirGIOP_Loader"); - if (bidir_loader != 0) + if (bidir_loader != nullptr) { - bidir_loader->init (0, 0); + bidir_loader->init (0, nullptr); } #if defined (TAO_HAS_ZIOP) && TAO_HAS_ZIOP == 1 @@ -747,9 +747,9 @@ namespace pcfg, "ZIOP_Loader"); - if (ziop_loader != 0) + if (ziop_loader != nullptr) { - ziop_loader->init (0, 0); + ziop_loader->init (0, nullptr); } #endif @@ -758,9 +758,9 @@ namespace pcfg, "Messaging_Loader"); - if (messaging_loader != 0) + if (messaging_loader != nullptr) { - messaging_loader->init (0, 0); + messaging_loader->init (0, nullptr); } // Handle RTCORBA library special case. Since RTCORBA needs @@ -771,9 +771,9 @@ namespace pcfg, "RT_ORB_Loader"); - if (rt_loader != 0) + if (rt_loader != nullptr) { - rt_loader->init (0, 0); + rt_loader->init (0, nullptr); } ACE_Service_Object * const rtscheduler_loader = @@ -781,9 +781,9 @@ namespace pcfg, "RTScheduler_Loader"); - if (rtscheduler_loader != 0) + if (rtscheduler_loader != nullptr) { - rtscheduler_loader->init (0, 0); + rtscheduler_loader->init (0, nullptr); } ACE_Service_Object * const csd_framework_loader = @@ -791,9 +791,9 @@ namespace pcfg, "CSD_Framework_Loader"); - if (csd_framework_loader != 0) + if (csd_framework_loader != nullptr) { - csd_framework_loader->init (0, 0); + csd_framework_loader->init (0, nullptr); } ACE_Service_Object * const endpoint_policy_loader = @@ -801,9 +801,9 @@ namespace pcfg, "EndpointPolicy_Initializer"); - if (endpoint_policy_loader != 0) + if (endpoint_policy_loader != nullptr) { - endpoint_policy_loader->init (0, 0); + endpoint_policy_loader->init (0, nullptr); } ACE_Service_Object * const diffserv_policy_loader = @@ -811,9 +811,9 @@ namespace pcfg, "DiffservPolicy_Initializer"); - if (diffserv_policy_loader != 0) + if (diffserv_policy_loader != nullptr) { - diffserv_policy_loader->init (0, 0); + diffserv_policy_loader->init (0, nullptr); } } /* register_additional_services_i */ @@ -838,7 +838,7 @@ namespace // Proceeds only if the configuration file exists. FILE * const conf_file = ACE_OS::fopen (current_arg, ACE_TEXT ("r")); - if (0 == conf_file) + if (nullptr == conf_file) { // Assigning EINVAL to errno to make an exception // thrown. calling code does not throw an exception if @@ -898,7 +898,7 @@ namespace while (arg_shifter.is_anything_left ()) { - const ACE_TCHAR *current_arg = 0; + const ACE_TCHAR *current_arg = nullptr; if (0 == arg_shifter.cur_arg_strncasecmp (ACE_TEXT ("-ORBSkipServiceConfigOpen"))) { @@ -913,7 +913,7 @@ namespace arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT ("-ORBServiceConfigLoggerKey")))) { svc_config_argv.add (ACE_TEXT ("-k")); @@ -930,12 +930,12 @@ namespace // Don't consume, the ORB_Core::init will use it again. arg_shifter.ignore_arg(); - if (0 != (current_arg = arg_shifter.get_current())) + if (nullptr != (current_arg = arg_shifter.get_current())) negotiate_codesets = (ACE_OS::atoi (current_arg)); arg_shifter.ignore_arg(); } - else if (0 != (current_arg = + else if (nullptr != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT ("-ORBDebugLevel")))) { @@ -1044,7 +1044,7 @@ namespace // This should set current_arg to the value of ORBGestalt option. const ACE_TCHAR *current_arg = arg_shifter.get_current (); - if (0 != current_arg && + if (nullptr != current_arg && ACE_OS::strcasecmp (current_arg, ACE_TEXT("GLOBAL")) != 0) { with_global_gestalt = false; diff --git a/TAO/tao/TAO_Server_Request.cpp b/TAO/tao/TAO_Server_Request.cpp index 81c8828191f..52578239720 100644 --- a/TAO/tao/TAO_Server_Request.cpp +++ b/TAO/tao/TAO_Server_Request.cpp @@ -49,7 +49,7 @@ TAO_ServerRequest::TAO_ServerRequest (TAO_GIOP_Message_Base *mesg_base, TAO_Transport *transport, TAO_ORB_Core *orb_core) : mesg_base_ (mesg_base), - operation_ (0), + operation_ (nullptr), operation_len_ (0), release_operation_ (false), is_forwarded_ (false), @@ -65,14 +65,14 @@ TAO_ServerRequest::TAO_ServerRequest (TAO_GIOP_Message_Base *mesg_base, orb_core_ (orb_core), request_id_ (0), profile_ (orb_core), - requesting_principal_ (0), + requesting_principal_ (nullptr), dsi_nvlist_align_ (0), - operation_details_ (0), + operation_details_ (nullptr), argument_flag_ (true) #if TAO_HAS_INTERCEPTORS == 1 , interceptor_count_ (0) - , rs_pi_current_ (0) - , caught_exception_ (0) + , rs_pi_current_ (nullptr) + , caught_exception_ (nullptr) , pi_reply_status_ (-1) #endif /* TAO_HAS_INTERCEPTORS == 1 */ , transport_(transport) //already duplicated in TAO_Transport::process_parsed_messages () @@ -94,10 +94,10 @@ TAO_ServerRequest::TAO_ServerRequest (TAO_GIOP_Message_Base *mesg_base, int &parse_error) : mesg_base_ (mesg_base), operation_ (CORBA::string_dup (operation)), - operation_len_ (operation == 0 ? 0 : ACE_OS::strlen (operation)), + operation_len_ (operation == nullptr ? 0 : ACE_OS::strlen (operation)), release_operation_ (true), is_forwarded_ (false), - incoming_ (0), + incoming_ (nullptr), outgoing_ (&output), response_expected_ (response_expected), deferred_reply_ (deferred_reply), @@ -108,14 +108,14 @@ TAO_ServerRequest::TAO_ServerRequest (TAO_GIOP_Message_Base *mesg_base, orb_core_ (orb_core), request_id_ (request_id), profile_ (orb_core), - requesting_principal_ (0), + requesting_principal_ (nullptr), dsi_nvlist_align_ (0), - operation_details_ (0), + operation_details_ (nullptr), argument_flag_ (true) #if TAO_HAS_INTERCEPTORS == 1 , interceptor_count_ (0) - , rs_pi_current_ (0) - , caught_exception_ (0) + , rs_pi_current_ (nullptr) + , caught_exception_ (nullptr) , pi_reply_status_ (-1) #endif /* TAO_HAS_INTERCEPTORS == 1 */ , transport_(transport) //already duplicated in TAO_Transport::process_parsed_messages () @@ -128,13 +128,13 @@ TAO_ServerRequest::TAO_ServerRequest (TAO_GIOP_Message_Base *mesg_base, TAO_ServerRequest::TAO_ServerRequest (TAO_ORB_Core * orb_core, TAO_Operation_Details const & details, CORBA::Object_ptr target) - : mesg_base_ (0), + : mesg_base_ (nullptr), operation_ (details.opname ()), operation_len_ (details.opname_len ()), release_operation_ (false), is_forwarded_ (false), - incoming_ (0), - outgoing_ (0), + incoming_ (nullptr), + outgoing_ (nullptr), response_expected_ (details.response_flags () == TAO_TWOWAY_RESPONSE_FLAG || details.response_flags () == static_cast<CORBA::Octet> (Messaging::SYNC_WITH_SERVER) || details.response_flags () == static_cast<CORBA::Octet> (Messaging::SYNC_WITH_TARGET)), @@ -146,17 +146,17 @@ TAO_ServerRequest::TAO_ServerRequest (TAO_ORB_Core * orb_core, orb_core_ (orb_core), request_id_ (0), profile_ (orb_core), - requesting_principal_ (0), + requesting_principal_ (nullptr), dsi_nvlist_align_ (0), operation_details_ (&details), argument_flag_ (false) #if TAO_HAS_INTERCEPTORS == 1 , interceptor_count_ (0) - , rs_pi_current_ (0) - , caught_exception_ (0) + , rs_pi_current_ (nullptr) + , caught_exception_ (nullptr) , pi_reply_status_ (-1) #endif /* TAO_HAS_INTERCEPTORS == 1 */ - , transport_ (0) + , transport_ (nullptr) { // Have to use a const_cast<>. *sigh* this->profile_.object_key ( @@ -180,7 +180,7 @@ TAO_ServerRequest::TAO_ServerRequest (TAO_ORB_Core * orb_core, // then the operation details don't get the reply service context } -TAO_ServerRequest::~TAO_ServerRequest (void) +TAO_ServerRequest::~TAO_ServerRequest () { #if TAO_HAS_INTERCEPTORS == 1 if (this->rs_pi_current_) @@ -200,13 +200,13 @@ TAO_ServerRequest::~TAO_ServerRequest (void) } CORBA::ORB_ptr -TAO_ServerRequest::orb (void) +TAO_ServerRequest::orb () { return this->orb_core_->orb (); } TAO_Service_Context & -TAO_ServerRequest::reply_service_context (void) +TAO_ServerRequest::reply_service_context () { if (!operation_details_) { @@ -221,7 +221,7 @@ TAO_ServerRequest::reply_service_context (void) void -TAO_ServerRequest::init_reply (void) +TAO_ServerRequest::init_reply () { if (!this->outgoing_) return; // Collocated @@ -266,9 +266,9 @@ TAO_ServerRequest::init_reply (void) } this->outgoing_->message_attributes (this->request_id_, - 0, + nullptr, TAO_Message_Semantics (TAO_Message_Semantics::TAO_REPLY), - 0); + nullptr); // Construct a REPLY header. this->mesg_base_->generate_reply_header (*this->outgoing_, reply_params); @@ -288,11 +288,11 @@ TAO_ServerRequest::init_reply (void) ACE_TEXT ("marshal encoding forwarded objref failed\n"))); } } - this->transport_->assign_translators (0, this->outgoing_); + this->transport_->assign_translators (nullptr, this->outgoing_); } void -TAO_ServerRequest::send_no_exception_reply (void) +TAO_ServerRequest::send_no_exception_reply () { // Construct our reply generator. TAO_Pluggable_Reply_Params_Base reply_params; @@ -313,9 +313,9 @@ TAO_ServerRequest::send_no_exception_reply (void) reply_params.argument_flag_ = false; this->outgoing_->message_attributes (this->request_id_, - 0, + nullptr, TAO_Message_Semantics (TAO_Message_Semantics::TAO_REPLY), - 0); + nullptr); // Construct a REPLY header. this->mesg_base_->generate_reply_header (*this->outgoing_, reply_params); @@ -324,7 +324,7 @@ TAO_ServerRequest::send_no_exception_reply (void) // Send the message. int const result = this->transport_->send_message (*this->outgoing_, - 0, + nullptr, this, TAO_Message_Semantics (TAO_Message_Semantics::TAO_REPLY)); @@ -344,7 +344,7 @@ TAO_ServerRequest::send_no_exception_reply (void) } void -TAO_ServerRequest::tao_send_reply (void) +TAO_ServerRequest::tao_send_reply () { if (this->collocated ()) return; // No transport in the collocated case. @@ -352,7 +352,7 @@ TAO_ServerRequest::tao_send_reply (void) this->outgoing_->more_fragments (false); int const result = this->transport_->send_message (*this->outgoing_, - 0, + nullptr, this, TAO_Message_Semantics (TAO_Message_Semantics::TAO_REPLY)); if (result == -1) @@ -388,7 +388,7 @@ TAO_ServerRequest::tao_send_reply_exception (const CORBA::Exception &ex) // Make a default reply status // Check whether we are able to downcast the exception - if (CORBA::SystemException::_downcast (&ex) != 0) + if (CORBA::SystemException::_downcast (&ex) != nullptr) { reply_params.reply_status (GIOP::SYSTEM_EXCEPTION); } @@ -422,7 +422,7 @@ TAO_ServerRequest::tao_send_reply_exception (const CORBA::Exception &ex) gv.major, gv.minor); - this->transport_->assign_translators (0, &output); + this->transport_->assign_translators (nullptr, &output); try { @@ -441,7 +441,7 @@ TAO_ServerRequest::tao_send_reply_exception (const CORBA::Exception &ex) // Send the message if (this->transport_->send_message (*this->outgoing_, - 0, + nullptr, this, TAO_Message_Semantics (TAO_Message_Semantics::TAO_REPLY)) == -1) { @@ -503,7 +503,7 @@ TAO_ServerRequest::send_cached_reply (CORBA::OctetSeq &s) gv.major, gv.minor); - this->transport_->assign_translators (0, &output); + this->transport_->assign_translators (nullptr, &output); // A copy of the reply parameters TAO_Pluggable_Reply_Params_Base reply_params; @@ -522,9 +522,9 @@ TAO_ServerRequest::send_cached_reply (CORBA::OctetSeq &s) reply_params.reply_status (GIOP::NO_EXCEPTION); this->outgoing_->message_attributes (this->request_id_, - 0, + nullptr, TAO_Message_Semantics (TAO_Message_Semantics::TAO_REPLY), - 0); + nullptr); // Make the reply message if (this->mesg_base_->generate_reply_header (*this->outgoing_, @@ -552,7 +552,7 @@ TAO_ServerRequest::send_cached_reply (CORBA::OctetSeq &s) // Send the message if (this->transport_->send_message (*this->outgoing_, - 0, + nullptr, this, TAO_Message_Semantics (TAO_Message_Semantics::TAO_REPLY)) == -1) { @@ -565,16 +565,16 @@ TAO_ServerRequest::send_cached_reply (CORBA::OctetSeq &s) void TAO_ServerRequest::caught_exception (CORBA::Exception *exception) { - if (CORBA::SystemException::_downcast (exception) != 0) + if (CORBA::SystemException::_downcast (exception) != nullptr) this->pi_reply_status_ = PortableInterceptor::SYSTEM_EXCEPTION; - else if (CORBA::UserException::_downcast (exception) != 0) + else if (CORBA::UserException::_downcast (exception) != nullptr) this->pi_reply_status_ = PortableInterceptor::USER_EXCEPTION; this->caught_exception_ = exception; } TAO::PICurrent_Impl * -TAO_ServerRequest::rs_pi_current (void) +TAO_ServerRequest::rs_pi_current () { if (!this->rs_pi_current_) { diff --git a/TAO/tao/TAO_Server_Request.h b/TAO/tao/TAO_Server_Request.h index 0c0b15fd96a..db1720972d3 100644 --- a/TAO/tao/TAO_Server_Request.h +++ b/TAO/tao/TAO_Server_Request.h @@ -125,79 +125,79 @@ public: CORBA::Object_ptr target); /// Destructor. - ~TAO_ServerRequest (void); + ~TAO_ServerRequest (); /** * @name Request attributes. */ //@{ /// Return the operation name. - const char *operation (void) const; + const char *operation () const; /// Set the operation name. void operation (const char *operation, size_t length, int release); /// Return the length of the operation. - size_t operation_length (void) const; + size_t operation_length () const; //@} /// Return the underlying ORB. - CORBA::ORB_ptr orb (void); + CORBA::ORB_ptr orb (); /// Return the ORB core pointer member. - TAO_ORB_Core *orb_core (void) const; + TAO_ORB_Core *orb_core () const; /// Start a Reply message. - void init_reply (void); + void init_reply (); /// Retrieve the incoming stream. - TAO_InputCDR * incoming (void) const; + TAO_InputCDR * incoming () const; /// Retrieve the outgoing stream. - TAO_OutputCDR * outgoing (void) const; + TAO_OutputCDR * outgoing () const; /// Is the response expected? - CORBA::Boolean response_expected (void) const; + CORBA::Boolean response_expected () const; /// Should the reply be deferred? - CORBA::Boolean deferred_reply (void) const; + CORBA::Boolean deferred_reply () const; /// Set the response expected flag. void response_expected (CORBA::Boolean response); /// Should we return before dispatching the servant? - CORBA::Boolean sync_with_server (void) const; + CORBA::Boolean sync_with_server () const; /// Set the sync_with_server flag. void sync_with_server (CORBA::Boolean sync_flag); /// Is the request at risk of being queued? - CORBA::Boolean is_queued (void) const; + CORBA::Boolean is_queued () const; /// Set the queued flag. void is_queued (CORBA::Boolean qeueued_flag); /// Send a sync reply if needed after _dispatch is called - void sync_after_dispatch (void); + void sync_after_dispatch (); /// Send a sync reply if needed before _dispatch is called to avoid /// possible queuing first. - void sync_before_dispatch (void); + void sync_before_dispatch (); /// Used with reliable oneway requests. - void send_no_exception_reply (void); + void send_no_exception_reply (); - TAO::ObjectKey &object_key (void); + TAO::ObjectKey &object_key (); /// Return the request TAO_Service_Context - TAO_Service_Context &request_service_context (void); + TAO_Service_Context &request_service_context (); /// Return the reply TAO_Service_Context - TAO_Service_Context &reply_service_context (void); + TAO_Service_Context &reply_service_context (); - IOP::ServiceContextList &reply_service_info (void); + IOP::ServiceContextList &reply_service_info (); - IOP::ServiceContextList &request_service_info (void); + IOP::ServiceContextList &request_service_info (); /// Return the underlying transport TAO_Transport *transport (); @@ -205,7 +205,7 @@ public: /// To handle System Exceptions at the lowest level, a method /// returning the request_id_ is needed. //@{ - CORBA::ULong request_id (void); + CORBA::ULong request_id (); void request_id (CORBA::ULong req); //@} @@ -217,16 +217,16 @@ public: void forward_location (CORBA::Object_ptr forward_reference); /// Get the forward_location. - CORBA::Object_ptr forward_location (void); + CORBA::Object_ptr forward_location (); /** * Since forward location is allowed to be nil then this is a proper * method to check if the request is being forwarded. */ - bool is_forwarded (void) const; + bool is_forwarded () const; /// Get the reply status - GIOP::ReplyStatusType reply_status (void); + GIOP::ReplyStatusType reply_status (); /// Set the reply status void reply_status (GIOP::ReplyStatusType except_type); @@ -235,29 +235,29 @@ public: void requesting_principal (const CORBA::OctetSeq & principal); /// Return the reference to the tagged profile - TAO_Tagged_Profile &profile (void); + TAO_Tagged_Profile &profile (); - void tao_send_reply (void); + void tao_send_reply (); void tao_send_reply_exception (const CORBA::Exception& ex); /// Set the boolean member to true. - void is_dsi (void); + void is_dsi (); /// Set the member. void dsi_nvlist_align (ptrdiff_t alignment); /// Get the operation details for the current request. - TAO_Operation_Details const * operation_details (void) const; + TAO_Operation_Details const * operation_details () const; /// Set the argument_flag void argument_flag (CORBA::Boolean flag); /// Get the argument_flag - CORBA::Boolean argument_flag (void); + CORBA::Boolean argument_flag (); /// Returns @c true if the current request is collocated. - bool collocated (void) const; + bool collocated () const; #if TAO_HAS_INTERCEPTORS == 1 /// Send cached reply. Used in scenarios where the FTORB thinks that @@ -271,12 +271,12 @@ public: * code must be able to modify this value and use that value * at a later time without being forced to use TSS. */ - size_t & interceptor_count (void); + size_t & interceptor_count (); /// Return a reference to the "request scope" PICurrent object. - TAO::PICurrent_Impl *rs_pi_current (void); + TAO::PICurrent_Impl *rs_pi_current (); - CORBA::Exception *caught_exception (void); + CORBA::Exception *caught_exception (); void caught_exception (CORBA::Exception *exception); @@ -284,7 +284,7 @@ public: void pi_reply_status (PortableInterceptor::ReplyStatus s); /// Get the status of the received reply. - PortableInterceptor::ReplyStatus pi_reply_status (void); + PortableInterceptor::ReplyStatus pi_reply_status (); #endif /* TAO_HAS_INTERCEPTORS == 1 */ #if TAO_HAS_ZIOP == 1 @@ -297,7 +297,7 @@ public: private: /// Default ctor only used to create a TAO_ServerRequest that is about /// to be the target of a clone operation. - TAO_ServerRequest (void); + TAO_ServerRequest (); TAO_GIOP_Message_Base *mesg_base_; diff --git a/TAO/tao/TAO_Singleton_Manager.cpp b/TAO/tao/TAO_Singleton_Manager.cpp index c928a30d204..60ca39a7d95 100644 --- a/TAO/tao/TAO_Singleton_Manager.cpp +++ b/TAO/tao/TAO_Singleton_Manager.cpp @@ -13,7 +13,7 @@ namespace { // Singleton instance pointer. - TAO_Singleton_Manager * the_instance = 0; + TAO_Singleton_Manager * the_instance = nullptr; } #if (defined (ACE_HAS_VERSIONED_NAMESPACE) && ACE_HAS_VERSIONED_NAMESPACE == 1) @@ -38,9 +38,9 @@ TAO_SINGLETON_MANAGER_CLEANUP_DESTROYER_NAME (void *, void *) } #if (ACE_HAS_GCC_DESTRUCTOR_ATTRIBUTE == 1) -static void TAO_SINGLETON_MANAGER_FINI_NAME (void) ACE_GCC_DESTRUCTOR_ATTRIBUTE; +static void TAO_SINGLETON_MANAGER_FINI_NAME () ACE_GCC_DESTRUCTOR_ATTRIBUTE; -void TAO_SINGLETON_MANAGER_FINI_NAME (void) +void TAO_SINGLETON_MANAGER_FINI_NAME () { #if defined (TAO_HAS_VERSIONED_NAMESPACE) \ && TAO_HAS_VERSIONED_NAMESPACE == 1 @@ -55,13 +55,13 @@ void TAO_SINGLETON_MANAGER_FINI_NAME (void) TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Singleton_Manager::TAO_Singleton_Manager (void) - : default_mask_ (0), - thread_hook_ (0), +TAO_Singleton_Manager::TAO_Singleton_Manager () + : default_mask_ (nullptr), + thread_hook_ (nullptr), exit_info_ (), registered_with_object_manager_ (-1) #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) - , internal_lock_ (0) + , internal_lock_ (nullptr) # endif /* ACE_MT_SAFE */ { #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) @@ -69,7 +69,7 @@ TAO_Singleton_Manager::TAO_Singleton_Manager (void) TAO_SYNCH_RECURSIVE_MUTEX); # endif /* ACE_MT_SAFE */ // Be sure that no further instances are created via instance (). - if (the_instance == 0) + if (the_instance == nullptr) { the_instance = this; } @@ -82,25 +82,25 @@ TAO_Singleton_Manager::TAO_Singleton_Manager (void) (void) this->init (register_with_object_manager); } -TAO_Singleton_Manager::~TAO_Singleton_Manager (void) +TAO_Singleton_Manager::~TAO_Singleton_Manager () { this->dynamically_allocated_ = false; // Don't delete this again in fini() (void) this->fini (); #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) delete this->internal_lock_; - this->internal_lock_ = 0; + this->internal_lock_ = nullptr; #endif /* ACE_MT_SAFE */ } sigset_t * -TAO_Singleton_Manager::default_mask (void) +TAO_Singleton_Manager::default_mask () { return TAO_Singleton_Manager::instance ()->default_mask_; } ACE_Thread_Hook * -TAO_Singleton_Manager::thread_hook (void) +TAO_Singleton_Manager::thread_hook () { return TAO_Singleton_Manager::instance ()->thread_hook_; } @@ -115,18 +115,18 @@ TAO_Singleton_Manager::thread_hook (ACE_Thread_Hook *new_thread_hook) } TAO_Singleton_Manager * -TAO_Singleton_Manager::instance (void) +TAO_Singleton_Manager::instance () { // This function should be called during construction of static // instances, or before any other threads have been created in the // process. So, it's not thread safe. - if (the_instance == 0) + if (the_instance == nullptr) { - TAO_Singleton_Manager *instance_pointer = 0; + TAO_Singleton_Manager *instance_pointer = nullptr; ACE_NEW_RETURN (instance_pointer, TAO_Singleton_Manager, - 0); + nullptr); ACE_ASSERT (instance_pointer == the_instance); instance_pointer->dynamically_allocated_ = true; @@ -140,7 +140,7 @@ TAO_Singleton_Manager::instance (void) } int -TAO_Singleton_Manager::init (void) +TAO_Singleton_Manager::init () { if (this->registered_with_object_manager_ == -1) { @@ -203,7 +203,7 @@ TAO_Singleton_Manager::init (int register_with_object_manager) && ACE_Object_Manager::at_exit ( this, (ACE_CLEANUP_FUNC) TAO_SINGLETON_MANAGER_CLEANUP_DESTROYER_NAME, - 0, + nullptr, typeid (*this).name ()) != 0) return -1; @@ -219,9 +219,9 @@ TAO_Singleton_Manager::init (int register_with_object_manager) // reason. All objects clean up their per-object information and managed // objects, but only The Instance cleans up the static preallocated objects. int -TAO_Singleton_Manager::fini (void) +TAO_Singleton_Manager::fini () { - if (the_instance == 0 || this->shutting_down_i ()) + if (the_instance == nullptr || this->shutting_down_i ()) { // Too late. Or, maybe too early. Either fini () has already // been called, or init () was never called. @@ -240,7 +240,7 @@ TAO_Singleton_Manager::fini (void) if (this->next_) { this->next_->fini (); - this->next_ = 0; // Protect against recursive calls. + this->next_ = nullptr; // Protect against recursive calls. } // Call all registered cleanup hooks, in reverse order of @@ -254,13 +254,13 @@ TAO_Singleton_Manager::fini (void) } delete this->default_mask_; - this->default_mask_ = 0; + this->default_mask_ = nullptr; // Indicate that this TAO_Singleton_Manager instance has been shut down. this->object_manager_state_ = OBJ_MAN_SHUT_DOWN; if (this == the_instance) - the_instance = 0; + the_instance = nullptr; if (this->dynamically_allocated_) { @@ -271,7 +271,7 @@ TAO_Singleton_Manager::fini (void) } int -TAO_Singleton_Manager::starting_up (void) +TAO_Singleton_Manager::starting_up () { return the_instance @@ -280,7 +280,7 @@ TAO_Singleton_Manager::starting_up (void) } int -TAO_Singleton_Manager::shutting_down (void) +TAO_Singleton_Manager::shutting_down () { return the_instance diff --git a/TAO/tao/TAO_Singleton_Manager.h b/TAO/tao/TAO_Singleton_Manager.h index 54a4460b858..5f1cc3274fc 100644 --- a/TAO/tao/TAO_Singleton_Manager.h +++ b/TAO/tao/TAO_Singleton_Manager.h @@ -125,12 +125,10 @@ protected: //@} private: - - /// Disallow copying by not implementing the following ... - //@{ - TAO_Singleton_Manager (const TAO_Singleton_Manager &); - TAO_Singleton_Manager &operator= (const TAO_Singleton_Manager &); - //@} + TAO_Singleton_Manager (const TAO_Singleton_Manager &) = delete; + TAO_Singleton_Manager &operator= (const TAO_Singleton_Manager &) = delete; + TAO_Singleton_Manager (TAO_Singleton_Manager &&) = delete; + TAO_Singleton_Manager &operator= (TAO_Singleton_Manager &&) = delete; /// Register an object or array for deletion at program termination. /// See description of static version above for return values. diff --git a/TAO/tao/TSS_Resources.cpp b/TAO/tao/TSS_Resources.cpp index 9f1d44141a6..2e13d8d2271 100644 --- a/TAO/tao/TSS_Resources.cpp +++ b/TAO/tao/TSS_Resources.cpp @@ -4,10 +4,10 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_TSS_Resources::TAO_TSS_Resources (void) - : poa_current_impl_ (0) - , rtscheduler_current_impl_ (0) - , rtscheduler_previous_current_impl_ (0) +TAO_TSS_Resources::TAO_TSS_Resources () + : poa_current_impl_ (nullptr) + , rtscheduler_current_impl_ (nullptr) + , rtscheduler_previous_current_impl_ (nullptr) , rtcorba_current_priority_ (-1) // RTCORBA::minPriority - 1 , default_environment_ (&tss_environment_) @@ -16,20 +16,20 @@ TAO_TSS_Resources::TAO_TSS_Resources (void) , policy_current_ (&initial_policy_current_) #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ - , gui_resource_factory_ (0) + , gui_resource_factory_ (nullptr) #if (TAO_HAS_TRANSPORT_CURRENT == 1) - , tsg_ (0) + , tsg_ (nullptr) #endif /* TAO_HAS_TRANSPORT_CURRENT */ { } -TAO_TSS_Resources::~TAO_TSS_Resources (void) +TAO_TSS_Resources::~TAO_TSS_Resources () { delete this->gui_resource_factory_; } TAO_TSS_Resources * -TAO_TSS_Resources::instance (void) +TAO_TSS_Resources::instance () { // Hide the template instantiation to prevent multiple instances // from being created. diff --git a/TAO/tao/TSS_Resources.h b/TAO/tao/TSS_Resources.h index 3339d41b47a..645a612fe9c 100644 --- a/TAO/tao/TSS_Resources.h +++ b/TAO/tao/TSS_Resources.h @@ -47,13 +47,13 @@ class TAO_Export TAO_TSS_Resources public: /// Constructor - TAO_TSS_Resources (void); + TAO_TSS_Resources (); /// Destructor - ~TAO_TSS_Resources (void); + ~TAO_TSS_Resources (); /// Return a singleton instance of this class. - static TAO_TSS_Resources * instance (void); + static TAO_TSS_Resources * instance (); private: diff --git a/TAO/tao/Tagged_Components.cpp b/TAO/tao/Tagged_Components.cpp index b95b4a0cae9..a93161ce9fe 100644 --- a/TAO/tao/Tagged_Components.cpp +++ b/TAO/tao/Tagged_Components.cpp @@ -77,7 +77,7 @@ TAO_Tagged_Components::set_component_i (IOP::ComponentId tag, CORBA::Octet *buf = component.component_data.get_buffer (); for (const ACE_Message_Block *i = cdr.begin (); - i != 0; + i != nullptr; i = i->cont ()) { ACE_OS::memcpy (buf, i->rd_ptr (), i->length ()); diff --git a/TAO/tao/Tagged_Components.h b/TAO/tao/Tagged_Components.h index aab03fea27d..89c4e2ac87d 100644 --- a/TAO/tao/Tagged_Components.h +++ b/TAO/tao/Tagged_Components.h @@ -56,7 +56,7 @@ class TAO_Export TAO_Tagged_Components { public: /// Constructor - TAO_Tagged_Components (void); + TAO_Tagged_Components (); // = Standard OMG that require fast access. /// The the IOP::TAG_ORB_TYPE component value @@ -113,7 +113,7 @@ public: * MutipleComponentProfile. Added by request from Chris Hafey * <chris@stentorsoft.com> */ - IOP::MultipleComponentProfile &components (void); + IOP::MultipleComponentProfile &components (); private: /// Helper method to implement set_code_sets() diff --git a/TAO/tao/Tagged_Profile.h b/TAO/tao/Tagged_Profile.h index d205ead432e..0b41fc1ec9c 100644 --- a/TAO/tao/Tagged_Profile.h +++ b/TAO/tao/Tagged_Profile.h @@ -58,27 +58,27 @@ public: CORBA::Boolean unmarshall_object_key (TAO_InputCDR &cdr); /// Return the object key - TAO::ObjectKey &object_key (void); + TAO::ObjectKey &object_key (); /// Save the object key void object_key (TAO::ObjectKey &object_key); /// Return a const object key - const TAO::ObjectKey &object_key (void) const; + const TAO::ObjectKey &object_key () const; /// Get the tagged_profile - const IOP::TaggedProfile &tagged_profile (void) const; + const IOP::TaggedProfile &tagged_profile () const; /// Get the profile index, that needs to be used in the /// sequnce of TaggedProfiles contained IOP::IOR that is /// received from the client. - CORBA::ULong profile_index (void) const; + CORBA::ULong profile_index () const; /// Accessor to the type_id contained in the IOP::IOR received from /// the client. - const char* type_id (void) const; + const char* type_id () const; - CORBA::Short discriminator (void) const; + CORBA::Short discriminator () const; private: /// Extract the object key from the TaggedProfile and store it in diff --git a/TAO/tao/Thread_Lane_Resources.cpp b/TAO/tao/Thread_Lane_Resources.cpp index edd83b85c5f..32bc8c072df 100644 --- a/TAO/tao/Thread_Lane_Resources.cpp +++ b/TAO/tao/Thread_Lane_Resources.cpp @@ -18,20 +18,20 @@ TAO_Thread_Lane_Resources::TAO_Thread_Lane_Resources ( TAO_ORB_Core &orb_core, TAO_New_Leader_Generator *new_leader_generator) : orb_core_ (orb_core), - acceptor_registry_ (0), - connector_registry_ (0), - transport_cache_ (0), - leader_follower_ (0), + acceptor_registry_ (nullptr), + connector_registry_ (nullptr), + transport_cache_ (nullptr), + leader_follower_ (nullptr), new_leader_generator_ (new_leader_generator), - input_cdr_dblock_allocator_ (0), - input_cdr_buffer_allocator_ (0), - input_cdr_msgblock_allocator_ (0), - transport_message_buffer_allocator_ (0), - output_cdr_dblock_allocator_ (0), - output_cdr_buffer_allocator_ (0), - output_cdr_msgblock_allocator_ (0), - amh_response_handler_allocator_ (0), - ami_response_handler_allocator_ (0) + input_cdr_dblock_allocator_ (nullptr), + input_cdr_buffer_allocator_ (nullptr), + input_cdr_msgblock_allocator_ (nullptr), + transport_message_buffer_allocator_ (nullptr), + output_cdr_dblock_allocator_ (nullptr), + output_cdr_buffer_allocator_ (nullptr), + output_cdr_msgblock_allocator_ (nullptr), + amh_response_handler_allocator_ (nullptr), + ami_response_handler_allocator_ (nullptr) { // Create the transport cache. ACE_NEW (this->transport_cache_, @@ -43,20 +43,20 @@ TAO_Thread_Lane_Resources::TAO_Thread_Lane_Resources ( orb_core.orbid ())); } -TAO_Thread_Lane_Resources::~TAO_Thread_Lane_Resources (void) +TAO_Thread_Lane_Resources::~TAO_Thread_Lane_Resources () { } TAO::Transport_Cache_Manager & -TAO_Thread_Lane_Resources::transport_cache (void) +TAO_Thread_Lane_Resources::transport_cache () { return *this->transport_cache_; } int -TAO_Thread_Lane_Resources::has_acceptor_registry_been_created (void) const +TAO_Thread_Lane_Resources::has_acceptor_registry_been_created () const { - return this->acceptor_registry_ != 0; + return this->acceptor_registry_ != nullptr; } int @@ -71,10 +71,10 @@ TAO_Thread_Lane_Resources::is_collocated (const TAO_MProfile& mprofile) } TAO_Acceptor_Registry & -TAO_Thread_Lane_Resources::acceptor_registry (void) +TAO_Thread_Lane_Resources::acceptor_registry () { // Double check. - if (this->acceptor_registry_ == 0) + if (this->acceptor_registry_ == nullptr) { // @todo: Wouldnt this crash big time if you happen to // dereference a null-pointer? Needs fixing. @@ -83,7 +83,7 @@ TAO_Thread_Lane_Resources::acceptor_registry (void) this->lock_, *this->acceptor_registry_); - if (this->acceptor_registry_ == 0) + if (this->acceptor_registry_ == nullptr) { // @@ Not exception safe code // Get the resource factory. @@ -100,23 +100,23 @@ TAO_Thread_Lane_Resources::acceptor_registry (void) } TAO_Connector_Registry * -TAO_Thread_Lane_Resources::connector_registry (void) +TAO_Thread_Lane_Resources::connector_registry () { // Double check. - if (this->connector_registry_ == 0) + if (this->connector_registry_ == nullptr) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, - 0); + nullptr); - if (this->connector_registry_ == 0) + if (this->connector_registry_ == nullptr) { // Ask it to create a new acceptor registry. TAO_Connector_Registry *connector_registry = this->orb_core_.resource_factory ()->get_connector_registry (); - if (connector_registry == 0) + if (connector_registry == nullptr) { throw ::CORBA::INITIALIZE ( CORBA::SystemException::_tao_minor_code ( @@ -146,17 +146,17 @@ TAO_Thread_Lane_Resources::connector_registry (void) TAO_Leader_Follower & -TAO_Thread_Lane_Resources::leader_follower (void) +TAO_Thread_Lane_Resources::leader_follower () { // Double check. - if (this->leader_follower_ == 0) + if (this->leader_follower_ == nullptr) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, *this->leader_follower_); - if (this->leader_follower_ == 0) + if (this->leader_follower_ == nullptr) { // Create a new Leader Follower object. ACE_NEW_RETURN (this->leader_follower_, @@ -171,14 +171,14 @@ TAO_Thread_Lane_Resources::leader_follower (void) ACE_Allocator* -TAO_Thread_Lane_Resources::input_cdr_dblock_allocator (void) +TAO_Thread_Lane_Resources::input_cdr_dblock_allocator () { - if (this->input_cdr_dblock_allocator_ == 0) + if (this->input_cdr_dblock_allocator_ == nullptr) { // Double checked locking - ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, nullptr); - if (this->input_cdr_dblock_allocator_ == 0) + if (this->input_cdr_dblock_allocator_ == nullptr) { this->input_cdr_dblock_allocator_ = this->resource_factory ()->input_cdr_dblock_allocator (); @@ -190,14 +190,14 @@ TAO_Thread_Lane_Resources::input_cdr_dblock_allocator (void) ACE_Allocator* -TAO_Thread_Lane_Resources::input_cdr_buffer_allocator (void) +TAO_Thread_Lane_Resources::input_cdr_buffer_allocator () { - if (this->input_cdr_buffer_allocator_ == 0) + if (this->input_cdr_buffer_allocator_ == nullptr) { // Double checked locking - ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, nullptr); - if (this->input_cdr_buffer_allocator_ == 0) + if (this->input_cdr_buffer_allocator_ == nullptr) { this->input_cdr_buffer_allocator_ = this->resource_factory ()->input_cdr_buffer_allocator (); @@ -209,14 +209,14 @@ TAO_Thread_Lane_Resources::input_cdr_buffer_allocator (void) ACE_Allocator* -TAO_Thread_Lane_Resources::input_cdr_msgblock_allocator (void) +TAO_Thread_Lane_Resources::input_cdr_msgblock_allocator () { - if (this->input_cdr_msgblock_allocator_ == 0) + if (this->input_cdr_msgblock_allocator_ == nullptr) { // Double checked locking - ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, nullptr); - if (this->input_cdr_msgblock_allocator_ == 0) + if (this->input_cdr_msgblock_allocator_ == nullptr) { this->input_cdr_msgblock_allocator_ = this->resource_factory ()->input_cdr_msgblock_allocator (); @@ -227,14 +227,14 @@ TAO_Thread_Lane_Resources::input_cdr_msgblock_allocator (void) } ACE_Allocator* -TAO_Thread_Lane_Resources::transport_message_buffer_allocator (void) +TAO_Thread_Lane_Resources::transport_message_buffer_allocator () { - if (this->transport_message_buffer_allocator_ == 0) + if (this->transport_message_buffer_allocator_ == nullptr) { // Double checked locking - ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, nullptr); - if (this->transport_message_buffer_allocator_ == 0) + if (this->transport_message_buffer_allocator_ == nullptr) { this->transport_message_buffer_allocator_ = this->resource_factory ()->input_cdr_dblock_allocator (); @@ -246,14 +246,14 @@ TAO_Thread_Lane_Resources::transport_message_buffer_allocator (void) ACE_Allocator* -TAO_Thread_Lane_Resources::output_cdr_dblock_allocator (void) +TAO_Thread_Lane_Resources::output_cdr_dblock_allocator () { - if (this->output_cdr_dblock_allocator_ == 0) + if (this->output_cdr_dblock_allocator_ == nullptr) { // Double checked locking - ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, nullptr); - if (this->output_cdr_dblock_allocator_ == 0) + if (this->output_cdr_dblock_allocator_ == nullptr) { this->output_cdr_dblock_allocator_ = this->resource_factory ()->output_cdr_dblock_allocator (); @@ -265,14 +265,14 @@ TAO_Thread_Lane_Resources::output_cdr_dblock_allocator (void) ACE_Allocator* -TAO_Thread_Lane_Resources::output_cdr_buffer_allocator (void) +TAO_Thread_Lane_Resources::output_cdr_buffer_allocator () { - if (this->output_cdr_buffer_allocator_ == 0) + if (this->output_cdr_buffer_allocator_ == nullptr) { // Double checked locking - ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, nullptr); - if (this->output_cdr_buffer_allocator_ == 0) + if (this->output_cdr_buffer_allocator_ == nullptr) { this->output_cdr_buffer_allocator_ = this->resource_factory ()->output_cdr_buffer_allocator (); @@ -284,14 +284,14 @@ TAO_Thread_Lane_Resources::output_cdr_buffer_allocator (void) ACE_Allocator* -TAO_Thread_Lane_Resources::output_cdr_msgblock_allocator (void) +TAO_Thread_Lane_Resources::output_cdr_msgblock_allocator () { - if (this->output_cdr_msgblock_allocator_ == 0) + if (this->output_cdr_msgblock_allocator_ == nullptr) { // Double checked locking - ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, nullptr); - if (this->output_cdr_msgblock_allocator_ == 0) + if (this->output_cdr_msgblock_allocator_ == nullptr) { this->output_cdr_msgblock_allocator_ = this->resource_factory ()->output_cdr_msgblock_allocator (); @@ -302,14 +302,14 @@ TAO_Thread_Lane_Resources::output_cdr_msgblock_allocator (void) } ACE_Allocator* -TAO_Thread_Lane_Resources::amh_response_handler_allocator (void) +TAO_Thread_Lane_Resources::amh_response_handler_allocator () { - if (this->amh_response_handler_allocator_ == 0) + if (this->amh_response_handler_allocator_ == nullptr) { // Double checked locking - ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, nullptr); - if (this->amh_response_handler_allocator_ == 0) + if (this->amh_response_handler_allocator_ == nullptr) { this->amh_response_handler_allocator_ = this->resource_factory ()->amh_response_handler_allocator (); @@ -320,14 +320,14 @@ TAO_Thread_Lane_Resources::amh_response_handler_allocator (void) } ACE_Allocator* -TAO_Thread_Lane_Resources::ami_response_handler_allocator (void) +TAO_Thread_Lane_Resources::ami_response_handler_allocator () { - if (this->ami_response_handler_allocator_ == 0) + if (this->ami_response_handler_allocator_ == nullptr) { // Double checked locking - ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, nullptr); - if (this->ami_response_handler_allocator_ == 0) + if (this->ami_response_handler_allocator_ == nullptr) { this->ami_response_handler_allocator_ = this->resource_factory ()->ami_response_handler_allocator (); @@ -352,29 +352,29 @@ TAO_Thread_Lane_Resources::open_acceptor_registry (const TAO_EndpointSet &endpoi } TAO_Resource_Factory * -TAO_Thread_Lane_Resources::resource_factory (void) +TAO_Thread_Lane_Resources::resource_factory () { return this->orb_core_.resource_factory (); } void -TAO_Thread_Lane_Resources::finalize (void) +TAO_Thread_Lane_Resources::finalize () { // Close connectors before acceptors! // Ask the registry to close all registered connectors. - if (this->connector_registry_ != 0) + if (this->connector_registry_ != nullptr) { this->connector_registry_->close_all (); delete this->connector_registry_; - this->connector_registry_ = 0; + this->connector_registry_ = nullptr; } // Ask the registry to close all registered acceptors. - if (this->acceptor_registry_ != 0) + if (this->acceptor_registry_ != nullptr) { this->acceptor_registry_->close_all (); delete this->acceptor_registry_; - this->acceptor_registry_ = 0; + this->acceptor_registry_ = nullptr; } // Set of handlers still in the connection cache. @@ -389,7 +389,7 @@ TAO_Thread_Lane_Resources::finalize (void) // Go through the handler set, closing the connections and removing // the references. - TAO_Connection_Handler **handler = 0; + TAO_Connection_Handler **handler = nullptr; for (TAO::Connection_Handler_Set::iterator iter (handlers); iter.next (handler); @@ -403,80 +403,80 @@ TAO_Thread_Lane_Resources::finalize (void) } delete this->transport_cache_; - this->transport_cache_ = 0; + this->transport_cache_ = nullptr; delete this->leader_follower_; - this->leader_follower_ = 0; + this->leader_follower_ = nullptr; // Delete all the allocators here.. They shouldnt be done earlier, // lest some of the contents in the above, say reactor or acceptor // may use memory from the pool.. - if (this->input_cdr_dblock_allocator_ != 0) + if (this->input_cdr_dblock_allocator_ != nullptr) { this->input_cdr_dblock_allocator_->remove (); delete this->input_cdr_dblock_allocator_; - this->input_cdr_dblock_allocator_ = 0; + this->input_cdr_dblock_allocator_ = nullptr; } - if (this->input_cdr_buffer_allocator_ != 0) + if (this->input_cdr_buffer_allocator_ != nullptr) { this->input_cdr_buffer_allocator_->remove (); delete this->input_cdr_buffer_allocator_; - this->input_cdr_buffer_allocator_ = 0; + this->input_cdr_buffer_allocator_ = nullptr; } - if (this->input_cdr_msgblock_allocator_ != 0) + if (this->input_cdr_msgblock_allocator_ != nullptr) { this->input_cdr_msgblock_allocator_->remove (); delete this->input_cdr_msgblock_allocator_; - this->input_cdr_msgblock_allocator_ = 0; + this->input_cdr_msgblock_allocator_ = nullptr; } - if (this->transport_message_buffer_allocator_ != 0) + if (this->transport_message_buffer_allocator_ != nullptr) { this->transport_message_buffer_allocator_->remove (); delete this->transport_message_buffer_allocator_; - this->transport_message_buffer_allocator_ = 0; + this->transport_message_buffer_allocator_ = nullptr; } - if (this->output_cdr_dblock_allocator_ != 0) + if (this->output_cdr_dblock_allocator_ != nullptr) { this->output_cdr_dblock_allocator_->remove (); delete this->output_cdr_dblock_allocator_; - this->output_cdr_dblock_allocator_ = 0; + this->output_cdr_dblock_allocator_ = nullptr; } - if (this->output_cdr_buffer_allocator_ != 0) + if (this->output_cdr_buffer_allocator_ != nullptr) { this->output_cdr_buffer_allocator_->remove (); delete this->output_cdr_buffer_allocator_; - this->output_cdr_buffer_allocator_ = 0; + this->output_cdr_buffer_allocator_ = nullptr; } - if (this->output_cdr_msgblock_allocator_ != 0) + if (this->output_cdr_msgblock_allocator_ != nullptr) { this->output_cdr_msgblock_allocator_->remove (); delete this->output_cdr_msgblock_allocator_; - this->output_cdr_msgblock_allocator_ = 0; + this->output_cdr_msgblock_allocator_ = nullptr; } - if (this->amh_response_handler_allocator_ != 0) + if (this->amh_response_handler_allocator_ != nullptr) { this->amh_response_handler_allocator_->remove (); delete this->amh_response_handler_allocator_; - this->amh_response_handler_allocator_ = 0; + this->amh_response_handler_allocator_ = nullptr; } - if (this->ami_response_handler_allocator_ != 0) + if (this->ami_response_handler_allocator_ != nullptr) { this->ami_response_handler_allocator_->remove (); delete this->ami_response_handler_allocator_; - this->ami_response_handler_allocator_ = 0; + this->ami_response_handler_allocator_ = nullptr; } } void -TAO_Thread_Lane_Resources::shutdown_reactor (void) +TAO_Thread_Lane_Resources::shutdown_reactor () { TAO_Leader_Follower &leader_follower = this->leader_follower (); @@ -508,11 +508,11 @@ TAO_Thread_Lane_Resources::shutdown_reactor (void) } void -TAO_Thread_Lane_Resources::close_all_transports (void) +TAO_Thread_Lane_Resources::close_all_transports () { // If we have no-drop-reply strategy or already fininalized simply return. if (!this->orb_core_.resource_factory ()->drop_replies_during_shutdown () || - this->transport_cache_ == 0) + this->transport_cache_ == nullptr) return; // Set of handlers still in the connection cache. @@ -527,7 +527,7 @@ TAO_Thread_Lane_Resources::close_all_transports (void) // Go through the handler set, closing the connections and removing // the references. - TAO_Connection_Handler **handler = 0; + TAO_Connection_Handler **handler = nullptr; for (TAO::Connection_Handler_Set::iterator iter (handlers); iter.next (handler); diff --git a/TAO/tao/Thread_Lane_Resources.h b/TAO/tao/Thread_Lane_Resources.h index 1ae4954e843..eed52ccf519 100644 --- a/TAO/tao/Thread_Lane_Resources.h +++ b/TAO/tao/Thread_Lane_Resources.h @@ -55,7 +55,7 @@ public: TAO_New_Leader_Generator *new_leader_generator = 0); /// Destructor. - ~TAO_Thread_Lane_Resources (void); + ~TAO_Thread_Lane_Resources (); /// Does @a mprofile belong to us? int is_collocated (const TAO_MProfile &mprofile); @@ -65,94 +65,94 @@ public: bool ignore_address); /// Finalize resources. - void finalize (void); + void finalize (); /// Shutdown the reactor. - void shutdown_reactor (void); + void shutdown_reactor (); /// Certain ORB policies such as dropping replies on shutdown /// would need cleanup of transports to wake threads up. - void close_all_transports (void); + void close_all_transports (); /// @name Accessors //@{ - TAO_Acceptor_Registry &acceptor_registry (void); + TAO_Acceptor_Registry &acceptor_registry (); /** * @note Returning a pointer helps to return 0 in case of * exceptions. */ - TAO_Connector_Registry *connector_registry (void); + TAO_Connector_Registry *connector_registry (); /// Get the transport cache - TAO::Transport_Cache_Manager &transport_cache (void); + TAO::Transport_Cache_Manager &transport_cache (); - TAO_Leader_Follower &leader_follower (void); + TAO_Leader_Follower &leader_follower (); /** * Allocator is intended for allocating the ACE_Data_Blocks used in * incoming CDR streams. This allocator has locks. */ - ACE_Allocator *input_cdr_dblock_allocator (void); + ACE_Allocator *input_cdr_dblock_allocator (); /** * Allocator is intended for allocating the buffers in the incoming * CDR streams. This allocator has locks. */ - ACE_Allocator *input_cdr_buffer_allocator (void); + ACE_Allocator *input_cdr_buffer_allocator (); /** * Allocator is intended for allocating the ACE_Message_Blocks used * in incoming CDR streams. This allocator is global, and has locks. */ - ACE_Allocator *input_cdr_msgblock_allocator (void); + ACE_Allocator *input_cdr_msgblock_allocator (); /** * Allocator is intended for allocating the buffers used in the * Transport object. This allocator has locks. */ - ACE_Allocator *transport_message_buffer_allocator (void); + ACE_Allocator *transport_message_buffer_allocator (); /** * Allocator is intended for allocating the ACE_Data_Blocks used in * outgoing CDR streams. This allocator has locks. */ - ACE_Allocator *output_cdr_dblock_allocator (void); + ACE_Allocator *output_cdr_dblock_allocator (); /** * Allocator is intended for allocating the buffers in the outgoing * CDR streams. This allocator has locks. */ - ACE_Allocator *output_cdr_buffer_allocator (void); + ACE_Allocator *output_cdr_buffer_allocator (); /** * Allocator is intended for allocating the ACE_Message_Blocks used * in the outgoing CDR streams. This allocator is global, and has * locks. */ - ACE_Allocator *output_cdr_msgblock_allocator (void); + ACE_Allocator *output_cdr_msgblock_allocator (); /** * Allocator is intended for allocating the AMH response handlers * This allocator is global. */ - ACE_Allocator *amh_response_handler_allocator (void); + ACE_Allocator *amh_response_handler_allocator (); /** * Allocator is intended for allocating the AMI response handlers * This allocator is global. */ - ACE_Allocator *ami_response_handler_allocator (void); + ACE_Allocator *ami_response_handler_allocator (); //@} private: /// Checks if the acceptor registry has been created. - int has_acceptor_registry_been_created (void) const; + int has_acceptor_registry_been_created () const; /// Helper to get the resource factory in the ORB_Core - TAO_Resource_Factory *resource_factory (void); + TAO_Resource_Factory *resource_factory (); private: /// ORB_Core related to this thread lane. diff --git a/TAO/tao/Thread_Lane_Resources_Manager.cpp b/TAO/tao/Thread_Lane_Resources_Manager.cpp index feac67c8c5f..9a8cc6b6f19 100644 --- a/TAO/tao/Thread_Lane_Resources_Manager.cpp +++ b/TAO/tao/Thread_Lane_Resources_Manager.cpp @@ -9,24 +9,24 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Thread_Lane_Resources_Manager::TAO_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core) : orb_core_ (&orb_core), - lf_strategy_ (0) + lf_strategy_ (nullptr) { this->lf_strategy_ = this->orb_core_->resource_factory ()->create_lf_strategy (); } -TAO_Thread_Lane_Resources_Manager::~TAO_Thread_Lane_Resources_Manager (void) +TAO_Thread_Lane_Resources_Manager::~TAO_Thread_Lane_Resources_Manager () { delete this->lf_strategy_; } TAO_LF_Strategy & -TAO_Thread_Lane_Resources_Manager::lf_strategy (void) +TAO_Thread_Lane_Resources_Manager::lf_strategy () { return *this->lf_strategy_; } -TAO_Thread_Lane_Resources_Manager_Factory::~TAO_Thread_Lane_Resources_Manager_Factory (void) +TAO_Thread_Lane_Resources_Manager_Factory::~TAO_Thread_Lane_Resources_Manager_Factory () { } diff --git a/TAO/tao/Thread_Lane_Resources_Manager.h b/TAO/tao/Thread_Lane_Resources_Manager.h index a67e1f104e3..eb9f72a05f6 100644 --- a/TAO/tao/Thread_Lane_Resources_Manager.h +++ b/TAO/tao/Thread_Lane_Resources_Manager.h @@ -43,30 +43,30 @@ public: TAO_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core); /// Destructor. - virtual ~TAO_Thread_Lane_Resources_Manager (void); + virtual ~TAO_Thread_Lane_Resources_Manager (); /// Finalize resources. - virtual void finalize (void) = 0; + virtual void finalize () = 0; /// Open default resources. - virtual int open_default_resources (void) = 0; + virtual int open_default_resources () = 0; /// Shutdown reactor. - virtual void shutdown_reactor (void) = 0; + virtual void shutdown_reactor () = 0; /// Cleanup transports to wake threads up waiting on those sockets. - virtual void close_all_transports (void) = 0; + virtual void close_all_transports () = 0; /// Does @a mprofile belong to us? virtual int is_collocated (const TAO_MProfile& mprofile) = 0; /// @name Accessors // @{ - virtual TAO_Thread_Lane_Resources &lane_resources (void) = 0; + virtual TAO_Thread_Lane_Resources &lane_resources () = 0; - virtual TAO_Thread_Lane_Resources &default_lane_resources (void) = 0; + virtual TAO_Thread_Lane_Resources &default_lane_resources () = 0; - TAO_LF_Strategy &lf_strategy (void); + TAO_LF_Strategy &lf_strategy (); // @} private: @@ -94,7 +94,7 @@ class TAO_Export TAO_Thread_Lane_Resources_Manager_Factory { public: /// Virtual destructor. - virtual ~TAO_Thread_Lane_Resources_Manager_Factory (void); + virtual ~TAO_Thread_Lane_Resources_Manager_Factory (); /// Factory method. virtual TAO_Thread_Lane_Resources_Manager * diff --git a/TAO/tao/Thread_Per_Connection_Handler.cpp b/TAO/tao/Thread_Per_Connection_Handler.cpp index c665403fc14..0b81e5e3a52 100644 --- a/TAO/tao/Thread_Per_Connection_Handler.cpp +++ b/TAO/tao/Thread_Per_Connection_Handler.cpp @@ -16,14 +16,14 @@ TAO_Thread_Per_Connection_Handler::TAO_Thread_Per_Connection_Handler ( this->ch_->transport ()->add_reference (); } -TAO_Thread_Per_Connection_Handler::~TAO_Thread_Per_Connection_Handler (void) +TAO_Thread_Per_Connection_Handler::~TAO_Thread_Per_Connection_Handler () { this->ch_->close_connection (); this->ch_->transport ()->remove_reference (); } int -TAO_Thread_Per_Connection_Handler::svc (void) +TAO_Thread_Per_Connection_Handler::svc () { ACE::clr_flags (this->ch_->transport ()->event_handler_i ()->get_handle (), ACE_NONBLOCK); diff --git a/TAO/tao/Time_Policy_Manager.cpp b/TAO/tao/Time_Policy_Manager.cpp index 8d03150147d..2a4e674dfdb 100644 --- a/TAO/tao/Time_Policy_Manager.cpp +++ b/TAO/tao/Time_Policy_Manager.cpp @@ -11,7 +11,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Time_Policy_Manager::TAO_Time_Policy_Manager () - : time_policy_strategy_ (0) + : time_policy_strategy_ (nullptr) #if defined(TAO_USE_HR_TIME_POLICY_STRATEGY) , time_policy_setting_ (TAO_HR_TIME_POLICY) #else @@ -68,17 +68,17 @@ TAO_Time_Policy_Manager::parse_args (int argc, ACE_TCHAR* argv[]) return 0; } -ACE_Timer_Queue * TAO_Time_Policy_Manager::create_timer_queue (void) +ACE_Timer_Queue * TAO_Time_Policy_Manager::create_timer_queue () { // locking scope { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, monitor, this->lock_, - 0); + nullptr); // check if time policy strategy has already been initialized - if (this->time_policy_strategy_ == 0) + if (this->time_policy_strategy_ == nullptr) { // load strategy if (this->time_policy_setting_ == TAO_OS_TIME_POLICY) @@ -92,13 +92,13 @@ ACE_Timer_Queue * TAO_Time_Policy_Manager::create_timer_queue (void) this->time_policy_strategy_ = ACE_Dynamic_Service<TAO_Time_Policy_Strategy>::instance ( this->time_policy_name_.c_str ()); - if (this->time_policy_strategy_ == 0) + if (this->time_policy_strategy_ == nullptr) { TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - TAO_Time_Policy_Manager: ") ACE_TEXT ("FAILED to load time policy strategy '%C'\n"), this->time_policy_name_.c_str ())); - return 0; + return nullptr; } if (TAO_debug_level > 1) @@ -128,7 +128,7 @@ TAO_Time_Policy_Manager::destroy_timer_queue (ACE_Timer_Queue *tmq) this->lock_); // check if time policy strategy has been initialized - if (this->time_policy_strategy_ == 0) + if (this->time_policy_strategy_ == nullptr) { return; } diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp index 37b2c37a234..13bfa7174f7 100644 --- a/TAO/tao/Transport.cpp +++ b/TAO/tao/Transport.cpp @@ -33,12 +33,6 @@ #include "ace/CORBA_macros.h" #include "ace/Truncate.h" -/* - * Specialization hook to add include files from - * concrete transport implementation. - */ -//@@ TAO_TRANSPORT_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK - #if !defined (__ACE_INLINE__) # include "tao/Transport.inl" #endif /* __ACE_INLINE__ */ @@ -124,13 +118,13 @@ TAO_Transport::TAO_Transport (CORBA::ULong tag, size_t input_cdr_size) : tag_ (tag) , orb_core_ (orb_core) - , cache_map_entry_ (0) - , tms_ (0) - , ws_ (0) + , cache_map_entry_ (nullptr) + , tms_ (nullptr) + , ws_ (nullptr) , bidirectional_flag_ (-1) , opening_connection_role_ (TAO::TAO_UNSPECIFIED_ROLE) - , head_ (0) - , tail_ (0) + , head_ (nullptr) + , tail_ (nullptr) , incoming_message_queue_ (orb_core) , current_deadline_ (ACE_Time_Value::zero) , flush_timer_id_ (-1) @@ -142,12 +136,12 @@ TAO_Transport::TAO_Transport (CORBA::ULong tag, , sent_byte_count_ (0) , is_connected_ (false) , connection_closed_on_read_ (false) - , messaging_object_ (0) - , char_translator_ (0) - , wchar_translator_ (0) + , messaging_object_ (nullptr) + , char_translator_ (nullptr) + , wchar_translator_ (nullptr) , tcs_set_ (0) , first_request_ (true) - , partial_message_ (0) + , partial_message_ (nullptr) #if TAO_HAS_SENDFILE == 1 // The ORB has been configured to use the MMAP allocator, meaning // we could/should use sendfile() to send data. Cast once rather @@ -159,7 +153,7 @@ TAO_Transport::TAO_Transport (CORBA::ULong tag, orb_core->output_cdr_buffer_allocator ())) #endif /* TAO_HAS_SENDFILE==1 */ #if TAO_HAS_TRANSPORT_CURRENT == 1 - , stats_ (0) + , stats_ (nullptr) #endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */ , flush_in_post_open_ (false) { @@ -183,17 +177,9 @@ TAO_Transport::TAO_Transport (CORBA::ULong tag, TAO::Transport::Stats, CORBA::NO_MEMORY ()); #endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */ - - /* - * Hook to add code that initializes components that - * belong to the concrete protocol implementation. - * Further additions to this Transport class will - * need to add code *before* this hook. - */ - //@@ TAO_TRANSPORT_SPL_CONSTRUCTOR_ADD_HOOK } -TAO_Transport::~TAO_Transport (void) +TAO_Transport::~TAO_Transport () { if (TAO_debug_level > 9) { @@ -227,19 +213,11 @@ TAO_Transport::~TAO_Transport (void) // The following assert is needed for the test "Bug_2494_Regression". // See the bugzilla bug #2494 for details. ACE_ASSERT (this->queue_is_empty_i ()); - ACE_ASSERT (this->cache_map_entry_ == 0); + ACE_ASSERT (this->cache_map_entry_ == nullptr); #if TAO_HAS_TRANSPORT_CURRENT == 1 delete this->stats_; #endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */ - - /* - * Hook to add code that cleans up components - * belong to the concrete protocol implementation. - * Further additions to this Transport class will - * need to add code *before* this hook. - */ - //@@ TAO_TRANSPORT_SPL_DESTRUCTOR_ADD_HOOK } void @@ -265,27 +243,17 @@ TAO_Transport::provide_blockable_handler (TAO::Connection_Handler_Set &h) } bool -TAO_Transport::idle_after_send (void) +TAO_Transport::idle_after_send () { return this->tms ()->idle_after_send (); } bool -TAO_Transport::idle_after_reply (void) +TAO_Transport::idle_after_reply () { return this->tms ()->idle_after_reply (); } -/* - * A concrete transport class specializes this - * method. This hook allows commenting this function - * when TAO's transport is specialized. Note: All - * functions that have an implementation that does - * nothing should be added within this hook to - * enable specialization. - */ -//@@ TAO_TRANSPORT_SPL_COMMENT_HOOK_START - int TAO_Transport::tear_listen_point_list (TAO_InputCDR &) { @@ -320,16 +288,14 @@ TAO_Transport::send_message_shared (TAO_Stub *stub, return result; } -//@@ TAO_TRANSPORT_SPL_COMMENT_HOOK_END - bool -TAO_Transport::post_connect_hook (void) +TAO_Transport::post_connect_hook () { return true; } bool -TAO_Transport::register_if_necessary (void) +TAO_Transport::register_if_necessary () { if (this->is_connected_ && this->wait_strategy ()->register_handler () == -1) @@ -357,13 +323,13 @@ TAO_Transport::register_if_necessary (void) } void -TAO_Transport::close_connection (void) +TAO_Transport::close_connection () { this->connection_handler_i ()->close_connection (); } int -TAO_Transport::register_handler (void) +TAO_Transport::register_handler () { if (TAO_debug_level > 4) { @@ -415,7 +381,7 @@ TAO_Transport::register_handler (void) } int -TAO_Transport::remove_handler (void) +TAO_Transport::remove_handler () { if (TAO_debug_level > 4) { @@ -434,7 +400,7 @@ TAO_Transport::remove_handler (void) false); - if (this->event_handler_i ()->reactor () == 0) + if (this->event_handler_i ()->reactor () == nullptr) { return 0; } @@ -467,7 +433,7 @@ TAO_Transport::remove_handler (void) // reset the reactor property of the event handler or // Transport::register_handler() will not re-register // when called after us again. - this->event_handler_i ()->reactor (0); + this->event_handler_i ()->reactor (nullptr); return 0; } } @@ -553,7 +519,7 @@ TAO_Transport::recache_transport (TAO_Transport_Descriptor_Interface *desc) } int -TAO_Transport::purge_entry (void) +TAO_Transport::purge_entry () { if (TAO_debug_level > 3) { @@ -567,13 +533,13 @@ TAO_Transport::purge_entry (void) } bool -TAO_Transport::can_be_purged (void) +TAO_Transport::can_be_purged () { return !this->tms_->has_request (); } int -TAO_Transport::make_idle (void) +TAO_Transport::make_idle () { if (TAO_debug_level > 3) { @@ -586,7 +552,7 @@ TAO_Transport::make_idle (void) } int -TAO_Transport::update_transport (void) +TAO_Transport::update_transport () { return this->transport_cache_manager ().update_entry (this->cache_map_entry_); } @@ -631,7 +597,7 @@ TAO_Transport::format_queue_message (TAO_OutputCDR &stream, ACE_Time_Value *max_wait_time, TAO_Stub* stub) { - if (this->messaging_object ()->format_message (stream, stub, 0) != 0) + if (this->messaging_object ()->format_message (stream, stub, nullptr) != 0) return -1; if (this->queue_message_i (stream.begin (), max_wait_time) != 0) @@ -848,7 +814,7 @@ TAO_Transport::send_reply_message_i (const ACE_Message_Block *mb, typedef ACE_Reverse_Lock<ACE_Lock> TAO_REVERSE_LOCK; TAO_REVERSE_LOCK reverse (*this->handler_lock_); ACE_GUARD_RETURN (TAO_REVERSE_LOCK, ace_mon, reverse, -1); - (void) flushing_strategy->flush_transport (this, 0); + (void) flushing_strategy->flush_transport (this, nullptr); } return 1; @@ -882,12 +848,12 @@ TAO_Transport::send_synch_message_helper_i (TAO_Synch_Queued_Message &synch_mess } int -TAO_Transport::schedule_output_i (void) +TAO_Transport::schedule_output_i () { ACE_Event_Handler * const eh = this->event_handler_i (); ACE_Reactor * const reactor = eh->reactor (); - if (reactor == 0) + if (reactor == nullptr) { if (TAO_debug_level > 1) { @@ -936,7 +902,7 @@ TAO_Transport::schedule_output_i (void) } int -TAO_Transport::cancel_output_i (void) +TAO_Transport::cancel_output_i () { ACE_Event_Handler * const eh = this->event_handler_i (); ACE_Reactor *const reactor = eh->reactor (); @@ -983,7 +949,7 @@ TAO_Transport::handle_timeout (const ACE_Time_Value & /* current_time */, typedef ACE_Reverse_Lock<ACE_Lock> TAO_REVERSE_LOCK; TAO_REVERSE_LOCK reverse (*this->handler_lock_); ACE_GUARD_RETURN (TAO_REVERSE_LOCK, ace_mon, reverse, -1); - if (flushing_strategy->flush_transport (this, 0) == -1) { + if (flushing_strategy->flush_transport (this, nullptr) == -1) { return -1; } } @@ -1106,7 +1072,7 @@ TAO_Transport::drain_queue_i (TAO::Transport::Drain_Constraints const & dc) // sent int iovcnt = 0; #if defined (ACE_INITIALIZE_MEMORY_BEFORE_USE) - iovec iov[ACE_IOV_MAX] = { { 0 , 0 } }; + iovec iov[ACE_IOV_MAX] = { { nullptr , 0 } }; #else iovec iov[ACE_IOV_MAX]; #endif /* ACE_INITIALIZE_MEMORY_BEFORE_USE */ @@ -1123,7 +1089,7 @@ TAO_Transport::drain_queue_i (TAO::Transport::Drain_Constraints const & dc) // If we are forced to send in the loop then we'll recompute the time. ACE_Time_Value now = ACE_High_Res_Timer::gettimeofday_hr (); - while (i != 0) + while (i != nullptr) { if (i->is_expired (now)) { @@ -1307,7 +1273,7 @@ TAO_Transport::check_buffering_constraints_i (TAO_Stub *stub, bool &must_flush) size_t msg_count = 0; size_t total_bytes = 0; - for (TAO_Queued_Message *i = this->head_; i != 0; i = i->next ()) + for (TAO_Queued_Message *i = this->head_; i != nullptr; i = i->next ()) { ++msg_count; total_bytes += i->message_length (); @@ -1375,7 +1341,7 @@ TAO_Transport::report_invalid_event_handler (const char *caller) } void -TAO_Transport::send_connection_closed_notifications (void) +TAO_Transport::send_connection_closed_notifications () { { ACE_MT (ACE_GUARD (ACE_Lock, guard, *this->handler_lock_)); @@ -1387,7 +1353,7 @@ TAO_Transport::send_connection_closed_notifications (void) } void -TAO_Transport::send_connection_closed_notifications_i (void) +TAO_Transport::send_connection_closed_notifications_i () { this->cleanup_queue_i (); } @@ -1423,7 +1389,7 @@ TAO_Transport::send_message_shared_i (TAO_Stub *stub, #if TAO_HAS_TRANSPORT_CURRENT == 1 // "Count" the message, only if no error was encountered. - if (ret != -1 && this->stats_ != 0) + if (ret != -1 && this->stats_ != nullptr) this->stats_->messages_sent (message_length); #endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */ @@ -1557,7 +1523,7 @@ TAO_Transport::send_asynchronous_message_i (TAO_Stub *stub, // ... part of the data was sent, need to figure out what piece // of the message block chain must be queued ... - while (message_block != 0 && message_block->length () == 0) + while (message_block != nullptr && message_block->length () == 0) { message_block = message_block->cont (); } @@ -1569,7 +1535,7 @@ TAO_Transport::send_asynchronous_message_i (TAO_Stub *stub, // ... either the message must be queued or we need to queue it // because it was not completely sent out ... - ACE_Time_Value *wait_time = (partially_sent ? 0: max_wait_time); + ACE_Time_Value *wait_time = (partially_sent ? nullptr: max_wait_time); if (this->queue_message_i (message_block, wait_time, !partially_sent) == -1) { @@ -1685,12 +1651,12 @@ int TAO_Transport::queue_message_i (const ACE_Message_Block *message_block, ACE_Time_Value *max_wait_time, bool back) { - TAO_Queued_Message *queued_message = 0; + TAO_Queued_Message *queued_message = nullptr; ACE_NEW_RETURN (queued_message, TAO_Asynch_Queued_Message (message_block, this->orb_core_, max_wait_time, - 0, + nullptr, true), -1); if (back) { @@ -1745,7 +1711,7 @@ TAO_Transport::handle_input (TAO_Resume_Handle &rh, } } - TAO_Queued_Data *q_data = 0; + TAO_Queued_Data *q_data = nullptr; if (this->incoming_message_stack_.top (q_data) != -1 && q_data->missing_data () != TAO_MISSING_DATA_UNDEFINED) @@ -1802,7 +1768,7 @@ TAO_Transport::consolidate_process_message (TAO_Queued_Data *q_data, q_data->msg_type () == GIOP::Fragment) { // consolidate message on top of stack, only for fragmented messages - TAO_Queued_Data *new_q_data = 0; + TAO_Queued_Data *new_q_data = nullptr; switch (this->messaging_object()->consolidate_fragmented_message (q_data, new_q_data)) { @@ -1882,7 +1848,7 @@ TAO_Transport::consolidate_enqueue_message (TAO_Queued_Data *q_data) if (q_data->more_fragments () || q_data->msg_type () == GIOP::Fragment) { - TAO_Queued_Data *new_q_data = 0; + TAO_Queued_Data *new_q_data = nullptr; switch (this->messaging_object()->consolidate_fragmented_message (q_data, new_q_data)) { @@ -1931,7 +1897,7 @@ TAO_Transport::handle_input_missing_data (TAO_Resume_Handle &rh, TAO_Queued_Data *q_data) { // paranoid check - if (q_data == 0) + if (q_data == nullptr) { return -1; } @@ -2012,7 +1978,7 @@ TAO_Transport::handle_input_parse_extra_messages ( // parsed int buf_status = 0; - TAO_Queued_Data *q_data = 0; // init + TAO_Queued_Data *q_data = nullptr; // init // parse buffer until all messages have been extracted, consolidate // and enqueue complete messages, if the last message being parsed @@ -2020,7 +1986,7 @@ TAO_Transport::handle_input_parse_extra_messages ( while (message_block.length () > 0 && (buf_status = this->messaging_object ()->extract_next_message (message_block, q_data)) != -1 && - q_data != 0) // paranoid check + q_data != nullptr) // paranoid check { if (q_data->missing_data () == 0) { @@ -2035,7 +2001,7 @@ TAO_Transport::handle_input_parse_extra_messages ( this->incoming_message_stack_.push (q_data); } - q_data = 0; // reset + q_data = nullptr; // reset } // while if (buf_status == -1) @@ -2090,7 +2056,7 @@ TAO_Transport::handle_input_parse_data (TAO_Resume_Handle &rh, size_t recv_size = 0; // Note: unsigned integer // Pointer to newly parsed message - TAO_Queued_Data *q_data = 0; + TAO_Queued_Data *q_data = nullptr; // Optimizing access of constants size_t const header_length = this->messaging_object ()->header_length (); @@ -2133,7 +2099,7 @@ TAO_Transport::handle_input_parse_data (TAO_Resume_Handle &rh, // If we have a partial message, copy it into our message block and // clear out the partial message. - if (this->partial_message_ != 0 && this->partial_message_->length () > 0) + if (this->partial_message_ != nullptr && this->partial_message_->length () > 0) { // (*) Copy back the partial message into current read-buffer, // verify that the read-strategy of "recv_size" bytes is not @@ -2170,7 +2136,7 @@ TAO_Transport::handle_input_parse_data (TAO_Resume_Handle &rh, ACE_TEXT ("Error - endless loop detection, closing connection"), this->id ())); } - if (this->partial_message_ != 0 && this->partial_message_->length () > 0) + if (this->partial_message_ != nullptr && this->partial_message_->length () > 0) { this->partial_message_->reset (); } @@ -2196,7 +2162,7 @@ TAO_Transport::handle_input_parse_data (TAO_Resume_Handle &rh, if (n <= 0) { if ((n < 0) && - (this->partial_message_ != 0 && this->partial_message_->length () > 0)) + (this->partial_message_ != nullptr && this->partial_message_->length () > 0)) { this->partial_message_->reset (); } @@ -2204,7 +2170,7 @@ TAO_Transport::handle_input_parse_data (TAO_Resume_Handle &rh, return ACE_Utils::truncate_cast<int> (n); } - if (this->partial_message_ != 0 && this->partial_message_->length () > 0) + if (this->partial_message_ != nullptr && this->partial_message_->length () > 0) { this->partial_message_->reset (); } @@ -2313,7 +2279,7 @@ TAO_Transport::handle_input_parse_data (TAO_Resume_Handle &rh, // Dealing with a fragment TAO_Queued_Data *nqd = TAO_Queued_Data::duplicate (qd); - if (nqd == 0) + if (nqd == nullptr) { return -1; } @@ -2362,7 +2328,7 @@ TAO_Transport::handle_input_parse_data (TAO_Resume_Handle &rh, TAO_Queued_Data *nqd = TAO_Queued_Data::duplicate (qd); - if (nqd == 0) + if (nqd == nullptr) { return -1; } @@ -2462,12 +2428,12 @@ TAO_Transport::handle_input_parse_data (TAO_Resume_Handle &rh, // in buffer that needs to be safed for next "handle_input" invocations. if (message_block.length () > 0) { - if (this->partial_message_ == 0) + if (this->partial_message_ == nullptr) { this->allocate_partial_message_block (); } - if (this->partial_message_ != 0 && + if (this->partial_message_ != nullptr && this->partial_message_->copy (message_block.rd_ptr (), message_block.length ()) == 0) { @@ -2497,7 +2463,7 @@ TAO_Transport::process_parsed_messages (TAO_Queued_Data *qd, #if TAO_HAS_TRANSPORT_CURRENT == 1 // Update stats, if any - if (this->stats_ != 0) + if (this->stats_ != nullptr) this->stats_->messages_received (qd->msg_block ()->length ()); #endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */ @@ -2670,7 +2636,7 @@ TAO_Transport::process_queue_head (TAO_Resume_Handle &rh) } int -TAO_Transport::notify_reactor_now (void) +TAO_Transport::notify_reactor_now () { ACE_Event_Handler *eh = this->event_handler_i (); @@ -2702,7 +2668,7 @@ TAO_Transport::notify_reactor_now (void) } TAO::Transport_Cache_Manager & -TAO_Transport::transport_cache_manager (void) +TAO_Transport::transport_cache_manager () { return this->orb_core_->lane_resources ().transport_cache (); } @@ -2727,36 +2693,36 @@ TAO_Transport::clear_translators (TAO_InputCDR *inp, TAO_OutputCDR *outp) { if (inp) { - inp->char_translator (0); - inp->wchar_translator (0); + inp->char_translator (nullptr); + inp->wchar_translator (nullptr); } if (outp) { - outp->char_translator (0); - outp->wchar_translator (0); + outp->char_translator (nullptr); + outp->wchar_translator (nullptr); } } ACE_Event_Handler::Reference_Count -TAO_Transport::add_reference (void) +TAO_Transport::add_reference () { return this->event_handler_i ()->add_reference (); } ACE_Event_Handler::Reference_Count -TAO_Transport::remove_reference (void) +TAO_Transport::remove_reference () { return this->event_handler_i ()->remove_reference (); } TAO_OutputCDR & -TAO_Transport::out_stream (void) +TAO_Transport::out_stream () { return this->messaging_object ()->out_stream (); } TAO_SYNCH_MUTEX & -TAO_Transport::output_cdr_lock (void) +TAO_Transport::output_cdr_lock () { return this->output_cdr_mutex_; } @@ -2768,7 +2734,7 @@ TAO_Transport::messaging_init (TAO_GIOP_Message_Version const &version) } void -TAO_Transport::pre_close (void) +TAO_Transport::pre_close () { if (TAO_debug_level > 9) { @@ -2814,7 +2780,7 @@ TAO_Transport::post_open (size_t id) TAO_Flushing_Strategy *flushing_strategy = this->orb_core ()->flushing_strategy (); - if (flushing_strategy == 0) + if (flushing_strategy == nullptr) throw CORBA::INTERNAL (); this->flush_in_post_open_ = false; @@ -2868,9 +2834,9 @@ TAO_Transport::post_open (size_t id) } void -TAO_Transport::allocate_partial_message_block (void) +TAO_Transport::allocate_partial_message_block () { - if (this->partial_message_ == 0) + if (this->partial_message_ == nullptr) { // This value must be at least large enough to hold a GIOP message // header plus a GIOP fragment header @@ -2899,13 +2865,13 @@ TAO_Transport::io_timeout( } if (this->wait_strategy()->can_process_upcalls()) { - return 0; + return nullptr; } return dc.timeout(); } bool -TAO_Transport::using_blocking_io_for_synch_messages (void) const +TAO_Transport::using_blocking_io_for_synch_messages () const { if (this->wait_strategy()->can_process_upcalls()) { @@ -2915,22 +2881,15 @@ TAO_Transport::using_blocking_io_for_synch_messages (void) const } bool -TAO_Transport::using_blocking_io_for_asynch_messages (void) const +TAO_Transport::using_blocking_io_for_asynch_messages () const { return false; } bool -TAO_Transport::connection_closed_on_read (void) const +TAO_Transport::connection_closed_on_read () const { return connection_closed_on_read_; } -/* - * Hook to add concrete implementations from the derived class onto - * TAO's transport. - */ - -//@@ TAO_TRANSPORT_SPL_METHODS_ADD_HOOK - TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Transport.h b/TAO/tao/Transport.h index ea7f68d4c96..4b3c84d069d 100644 --- a/TAO/tao/Transport.h +++ b/TAO/tao/Transport.h @@ -147,11 +147,6 @@ namespace TAO } } -/* - * Specialization hook for the TAO's transport implementation. - */ -//@@ TAO_TRANSPORT_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK - /** * @class TAO_Transport * @@ -326,7 +321,7 @@ public: size_t input_cdr_size = ACE_CDR::DEFAULT_BUFSIZE); /// Destructor - virtual ~TAO_Transport (void); + virtual ~TAO_Transport (); /// Return the protocol tag. /** @@ -334,10 +329,10 @@ public: * protocol. New protocol tags can be obtained free of charge from * the OMG, check the documents in corbafwd.h for more details. */ - CORBA::ULong tag (void) const; + CORBA::ULong tag () const; /// Access the ORB that owns this connection. - TAO_ORB_Core *orb_core (void) const; + TAO_ORB_Core *orb_core () const; /// Get the TAO_Tranport_Mux_Strategy used by this object. /** @@ -350,7 +345,7 @@ public: * connection is more efficient and reduces the possibilities of * priority inversions. */ - TAO_Transport_Mux_Strategy *tms (void) const; + TAO_Transport_Mux_Strategy *tms () const; /// Return the TAO_Wait_Strategy used by this object. /** @@ -360,7 +355,7 @@ public: * multiple events concurrently or using the Leader/Followers * protocol. */ - TAO_Wait_Strategy *wait_strategy (void) const; + TAO_Wait_Strategy *wait_strategy () const; enum Drain_Result_Enum { @@ -393,7 +388,7 @@ public: Drain_Result handle_output (TAO::Transport::Drain_Constraints const & c); /// Get the bidirectional flag - int bidirectional_flag (void) const; + int bidirectional_flag () const; /// Set the bidirectional flag void bidirectional_flag (int flag); @@ -402,7 +397,7 @@ public: void cache_map_entry (TAO::Transport_Cache_Manager::HASH_MAP_ENTRY *entry); /// Get the Cache Map entry - TAO::Transport_Cache_Manager::HASH_MAP_ENTRY *cache_map_entry (void); + TAO::Transport_Cache_Manager::HASH_MAP_ENTRY *cache_map_entry (); /// Set and Get the identifier for this transport instance. /** @@ -410,29 +405,29 @@ public: * the <code>this</code> pointer for the instance on which * it's called. */ - size_t id (void) const; + size_t id () const; void id (size_t id); /** * Methods dealing with the role of the connection, e.g., CLIENT or SERVER. * See CORBA 2.6 Specification, Section 15.5.1 for origin of definitions. */ - TAO::Connection_Role opened_as (void) const; + TAO::Connection_Role opened_as () const; void opened_as (TAO::Connection_Role); /// Get and Set the purging order. The purging strategy uses the set /// version to set the purging order. - unsigned long purging_order (void) const; + unsigned long purging_order () const; void purging_order(unsigned long value); /// Check if there are messages pending in the queue /** * @return true if the queue is empty */ - bool queue_is_empty (void); + bool queue_is_empty (); /// Register with the reactor via the wait strategy - bool register_if_necessary (void); + bool register_if_necessary (); /// Added event handler to the handlers set. @@ -470,10 +465,10 @@ public: * thread-per-connection mode. In that case putting the connection * in the Reactor would produce unpredictable results anyway. */ - virtual int register_handler (void); + virtual int register_handler (); /// Remove the handler from the reactor. - virtual int remove_handler (void); + virtual int remove_handler (); /// Write the complete Message_Block chain to the connection. /** @@ -558,14 +553,14 @@ public: /// Request has been just sent, but the reply is not received. Idle /// the transport now. - bool idle_after_send (void); + bool idle_after_send (); /// Request is sent and the reply is received. Idle the transport /// now. - bool idle_after_reply (void); + bool idle_after_reply (); /// Call the implementation method after obtaining the lock. - virtual void close_connection (void); + virtual void close_connection (); //@} /** @name Template methods @@ -599,18 +594,18 @@ public: * * @note The methods are not made const with a reason. */ - virtual bool post_connect_hook (void); + virtual bool post_connect_hook (); /// Memory management routines. /** * Forwards to event handler. */ - ACE_Event_Handler::Reference_Count add_reference (void); - ACE_Event_Handler::Reference_Count remove_reference (void); + ACE_Event_Handler::Reference_Count add_reference (); + ACE_Event_Handler::Reference_Count remove_reference (); /// Return the messaging object that is used to format the data that /// needs to be sent. - TAO_GIOP_Message_Base * messaging_object (void); + TAO_GIOP_Message_Base * messaging_object (); /** @name Template methods * @@ -638,43 +633,36 @@ public: * * @todo This method has to be renamed to event_handler() */ - virtual ACE_Event_Handler * event_handler_i (void) = 0; + virtual ACE_Event_Handler * event_handler_i () = 0; /// Is this transport really connected - bool is_connected (void) const; + bool is_connected () const; /// Was a connection seen as closed during a read - bool connection_closed_on_read (void) const; + bool connection_closed_on_read () const; /// Perform all the actions when this transport get opened bool post_open (size_t id); /// do what needs to be done when closing the transport - void pre_close (void); + void pre_close (); /// Get the connection handler for this transport - TAO_Connection_Handler * connection_handler (void); + TAO_Connection_Handler * connection_handler (); /// Accessor for the output CDR stream - TAO_OutputCDR &out_stream (void); + TAO_OutputCDR &out_stream (); /// Accessor for synchronizing Transport OutputCDR access - TAO_SYNCH_MUTEX &output_cdr_lock (void); + TAO_SYNCH_MUTEX &output_cdr_lock (); /// Can the transport be purged? - bool can_be_purged (void); + bool can_be_purged (); virtual void set_bidir_context_info (TAO_Operation_Details &opdetails); - /* - * Specialization hook to add public methods from - * concrete transport implementations to TAO's transport - * class - */ - //@@ TAO_TRANSPORT_SPL_PUBLIC_METHODS_ADD_HOOK - protected: - virtual TAO_Connection_Handler * connection_handler_i (void) = 0; + virtual TAO_Connection_Handler * connection_handler_i () = 0; public: /// This is a request for the transport object to write a @@ -840,13 +828,13 @@ public: TAO::Transport::Drain_Constraints const & dc); /// Cache management - int purge_entry (void); + int purge_entry (); /// Cache management - int make_idle (void); + int make_idle (); /// Cache management - int update_transport (void); + int update_transport (); /// The timeout callback, invoked when any of the timers related to /// this transport expire. @@ -868,16 +856,16 @@ public: int handle_timeout (const ACE_Time_Value ¤t_time, const void* act); /// Accessor to recv_buffer_size_ - size_t recv_buffer_size (void) const; + size_t recv_buffer_size () const; /// Accessor to sent_byte_count_ - size_t sent_byte_count (void) const; + size_t sent_byte_count () const; /// CodeSet Negotiation - Get the char codeset translator factory - TAO_Codeset_Translator_Base *char_translator (void) const; + TAO_Codeset_Translator_Base *char_translator () const; /// CodeSet Negotiation - Get the wchar codeset translator factory - TAO_Codeset_Translator_Base *wchar_translator (void) const; + TAO_Codeset_Translator_Base *wchar_translator () const; /// CodeSet negotiation - Set the char codeset translator factory void char_translator (TAO_Codeset_Translator_Base *); @@ -905,14 +893,14 @@ public: /// Notify all the components inside a Transport when the underlying /// connection is closed. - void send_connection_closed_notifications (void); + void send_connection_closed_notifications (); /// Transport statistics - TAO::Transport::Stats* stats (void) const; + TAO::Transport::Stats* stats () const; private: /// Helper method that returns the Transport Cache Manager. - TAO::Transport_Cache_Manager &transport_cache_manager (void); + TAO::Transport_Cache_Manager &transport_cache_manager (); /// Send some of the data in the queue. /** @@ -931,7 +919,7 @@ private: * * @return true if the queue is empty */ - bool queue_is_empty_i (void) const; + bool queue_is_empty_i () const; /// A helper routine used in drain_queue_i() Drain_Result drain_queue_helper (int &iovcnt, iovec iov[], @@ -948,10 +936,10 @@ private: friend class TAO_Thread_Per_Connection_Handler; /// Schedule handle_output() callbacks - int schedule_output_i (void); + int schedule_output_i (); /// Cancel handle_output() callbacks - int cancel_output_i (void); + int cancel_output_i (); /// Cleanup the queue. /** @@ -991,11 +979,11 @@ private: ACE_Time_Value *max_wait_time); /// Check if the flush timer is still pending - int flush_timer_pending (void) const; + int flush_timer_pending () const; /// The flush timer expired or was explicitly cancelled, mark it as /// not pending - void reset_flush_timer (void); + void reset_flush_timer (); /// Print out error messages if the event handler is not valid void report_invalid_event_handler (const char *caller); @@ -1038,25 +1026,25 @@ private: * This call prepares a new handler for the notify call and sends a * notify () call to the reactor. */ - int notify_reactor (void); + int notify_reactor (); protected: /* * Same as notify_reactor above but does NOT first check for a * registered TAO_Wait_Strategy. */ - int notify_reactor_now (void); + int notify_reactor_now (); private: ACE_UNIMPLEMENTED_FUNC (TAO_Transport (const TAO_Transport &)) ACE_UNIMPLEMENTED_FUNC (TAO_Transport &operator= (const TAO_Transport &)) /// Assume the lock is held - void send_connection_closed_notifications_i (void); + void send_connection_closed_notifications_i (); /// Allocate a partial message block and store it in our /// partial_message_ data member. - void allocate_partial_message_block (void); + void allocate_partial_message_block (); /** * Return true if blocking I/O should be used for sending synchronous @@ -1077,8 +1065,6 @@ private: * TAO's protocol implementation onto the base Transport class */ - //@@ TAO_TRANSPORT_SPL_PRIVATE_METHODS_ADD_HOOK - protected: /// IOP protocol tag. CORBA::ULong const tag_; @@ -1235,22 +1221,8 @@ private: /// lock for synchronizing Transport OutputCDR access mutable TAO_SYNCH_MUTEX output_cdr_mutex_; - - /* - * specialization hook to add class members from concrete - * transport class onto the base transport class. Please - * add any private members to this class *before* this hook. - */ - //@@ TAO_TRANSPORT_SPL_DATA_MEMBERS_ADD_HOOK }; -/* - * Hook to add external typedefs and specializations to - * TAO's transport implementation. - */ - -//@@ TAO_TRANSPORT_SPL_EXTERN_ADD_HOOK - #if TAO_HAS_TRANSPORT_CURRENT == 1 namespace TAO { @@ -1279,15 +1251,15 @@ namespace TAO virtual ~Stats (); void messages_sent (size_t message_length); - CORBA::LongLong messages_sent (void) const; - CORBA::LongLong bytes_sent (void) const; + CORBA::LongLong messages_sent () const; + CORBA::LongLong bytes_sent () const; void messages_received (size_t message_length); - CORBA::LongLong messages_received (void) const; - CORBA::LongLong bytes_received (void) const; + CORBA::LongLong messages_received () const; + CORBA::LongLong bytes_received () const; void opened_since (const ACE_Time_Value& tv); - const ACE_Time_Value& opened_since (void) const; + const ACE_Time_Value& opened_since () const; private: /// Mutex guarding the internal state of the statistics diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h index a47d4dea15b..bfc363cf8c4 100644 --- a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h +++ b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h @@ -45,8 +45,7 @@ namespace TAO virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); protected: virtual TAO::Transport::Current_ptr - make_current_instance (TAO_ORB_Core* core, size_t tss_slot_id) - = 0; + make_current_instance (TAO_ORB_Core* core, size_t tss_slot_id) = 0; protected: const ACE_TString id_; #if defined (ACE_WIN32_VC14) diff --git a/TAO/tao/Transport_Acceptor.cpp b/TAO/tao/Transport_Acceptor.cpp index 3ef9deb8982..bdf634c708b 100644 --- a/TAO/tao/Transport_Acceptor.cpp +++ b/TAO/tao/Transport_Acceptor.cpp @@ -15,10 +15,8 @@ TAO_Acceptor::TAO_Acceptor (CORBA::ULong tag) { } -TAO_Acceptor::~TAO_Acceptor (void) +TAO_Acceptor::~TAO_Acceptor () { - - //@@ TAO_ACCEPTOR_DESTRUCTOR_ADD_HOOK } int @@ -39,7 +37,7 @@ TAO_Acceptor::handle_accept_error (ACE_Event_Handler* base_acceptor) // Get the reactor. If there isn't one, which isn't very likely, // then just return -1. ACE_Reactor* reactor = base_acceptor->reactor (); - if (reactor == 0) + if (reactor == nullptr) return -1; // So that the reactor doesn't completely remove this handler from @@ -57,7 +55,7 @@ TAO_Acceptor::handle_accept_error (ACE_Event_Handler* base_acceptor) // Schedule a timer so that we can resume the handler in hopes // that some file handles have freed up. ACE_Time_Value timeout (this->error_retry_delay_); - reactor->schedule_timer (base_acceptor, 0, timeout); + reactor->schedule_timer (base_acceptor, nullptr, timeout); } // We want to keep accepting in all other situations. @@ -70,7 +68,7 @@ TAO_Acceptor::handle_expiration (ACE_Event_Handler* base_acceptor) // Get the reactor. If there isn't one, which isn't very likely, then // just return -1; ACE_Reactor* reactor = base_acceptor->reactor (); - if (reactor == 0) + if (reactor == nullptr) return -1; if (TAO_debug_level > 0) @@ -89,6 +87,4 @@ TAO_Acceptor::handle_expiration (ACE_Event_Handler* base_acceptor) return 0; } -//@@ TAO_ACCEPTOR_SPL_METHODS_ADD_HOOK - TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Transport_Acceptor.h b/TAO/tao/Transport_Acceptor.h index 984ad333825..87d660aa4c9 100644 --- a/TAO/tao/Transport_Acceptor.h +++ b/TAO/tao/Transport_Acceptor.h @@ -48,8 +48,6 @@ namespace TAO class ObjectKey; } -//@@ TAO_ACCEPTOR_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK - // **************************************************************** /// The TAO-specific OMG assigned value for the TAG_ORB_TYPE tagged @@ -78,10 +76,10 @@ public: TAO_Acceptor (CORBA::ULong tag); /// Destructor - virtual ~TAO_Acceptor (void); + virtual ~TAO_Acceptor (); /// The tag, each concrete class will have a specific tag value. - CORBA::ULong tag (void) const; + CORBA::ULong tag () const; /// Set the amount of time to delay accepting new connections in the /// event that we encounter an error that may be transient. @@ -106,7 +104,7 @@ public: const char *options = 0) = 0; /// Closes the acceptor - virtual int close (void) = 0; + virtual int close () = 0; /** * Create the corresponding profile for this endpoint. @@ -127,7 +125,7 @@ public: * is used for determining how many profiles will be generated * for this acceptor. */ - virtual CORBA::ULong endpoint_count (void) = 0; + virtual CORBA::ULong endpoint_count () = 0; /** * This method fetches the @a key from the @a profile. Protocols that @@ -148,23 +146,11 @@ public: /// into the reactor to try accepting again. int handle_expiration (ACE_Event_Handler* base_acceptor); - /* - * Hook to add public methods from derived acceptor classes onto - * this class. - */ - //@@ TAO_ACCEPTOR_SPL_PUBLIC_METHODS_ADD_HOOK - private: /// IOP protocol tag. CORBA::ULong const tag_; time_t error_retry_delay_; - - /* - * Hook to add data members from concrete acceptor implementations onto - * the base class. - */ - //@@ TAO_ACCEPTOR_SPL_DATA_MEMBERS_ADD_HOOK }; /// This is a drop-in replacement class for the ACE_Strategy_Acceptor. @@ -187,7 +173,7 @@ public: { } - virtual int handle_accept_error (void) + virtual int handle_accept_error () { return this->acceptor_->handle_accept_error (this); } @@ -201,8 +187,6 @@ private: TAO_Acceptor* acceptor_; }; -//@@ TAO_ACCEPTOR_SPL_EXTERN_ADD_HOOK - TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) diff --git a/TAO/tao/Transport_Cache_Manager_T.cpp b/TAO/tao/Transport_Cache_Manager_T.cpp index 868bd41cd97..ab7a56adf36 100644 --- a/TAO/tao/Transport_Cache_Manager_T.cpp +++ b/TAO/tao/Transport_Cache_Manager_T.cpp @@ -73,7 +73,7 @@ namespace TAO } template <typename TT, typename TRDT, typename PSTRAT> - Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::~Transport_Cache_Manager_T (void) + Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::~Transport_Cache_Manager_T () { delete this->cache_lock_; this->cache_lock_ = 0; @@ -561,7 +561,7 @@ namespace TAO template <typename TT, typename TRDT, typename PSTRAT> int - Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::purge (void) + Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::purge () { typedef ACE_Unbounded_Set<transport_type*> transport_set_type; transport_set_type transports_to_be_closed; diff --git a/TAO/tao/Transport_Cache_Manager_T.h b/TAO/tao/Transport_Cache_Manager_T.h index a61759c9398..7cc7c188264 100644 --- a/TAO/tao/Transport_Cache_Manager_T.h +++ b/TAO/tao/Transport_Cache_Manager_T.h @@ -101,7 +101,7 @@ namespace TAO const char *orbid); /// Destructor - ~Transport_Cache_Manager_T (void); + ~Transport_Cache_Manager_T (); /// Add the transport to the cache. /** @@ -122,7 +122,7 @@ namespace TAO size_t & busy_count); /// Remove entries from the cache depending upon the strategy. - int purge (void); + int purge (); /// Purge the entry from the Cache Map int purge_entry (HASH_MAP_ENTRY *& entry); @@ -158,13 +158,13 @@ namespace TAO bool blockable_client_transports (Connection_Handler_Set &handlers); /// Return the current size of the cache. - size_t current_size (void) const; + size_t current_size () const; /// Return the total size of the cache. - size_t total_size (void) const; + size_t total_size () const; /// Return the underlying cache map - HASH_MAP &map (void); + HASH_MAP &map (); private: /// Lookup entry<key,value> in the cache. Grabs the lock and calls the diff --git a/TAO/tao/Transport_Cache_Manager_T.inl b/TAO/tao/Transport_Cache_Manager_T.inl index 9c4e8c8ef0c..65ceaddfd57 100644 --- a/TAO/tao/Transport_Cache_Manager_T.inl +++ b/TAO/tao/Transport_Cache_Manager_T.inl @@ -137,21 +137,21 @@ namespace TAO template <typename TT, typename TRDT, typename PSTRAT> ACE_INLINE size_t - Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::current_size (void) const + Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::current_size () const { return this->cache_map_.current_size (); } template <typename TT, typename TRDT, typename PSTRAT> ACE_INLINE size_t - Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::total_size (void) const + Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::total_size () const { return this->cache_map_.total_size (); } template <typename TT, typename TRDT, typename PSTRAT> ACE_INLINE typename Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::HASH_MAP & - Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::map (void) + Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::map () { return this->cache_map_; } diff --git a/TAO/tao/Transport_Connector.cpp b/TAO/tao/Transport_Connector.cpp index 6a47a484bf3..4e4961b1f90 100644 --- a/TAO/tao/Transport_Connector.cpp +++ b/TAO/tao/Transport_Connector.cpp @@ -18,8 +18,6 @@ #include "ace/OS_NS_string.h" -//@@ TAO_CONNECTOR_SPL_INCLUDE_ADD_HOOK - #if !defined (__ACE_INLINE__) # include "tao/Transport_Connector.inl" #endif /* __ACE_INLINE__ */ @@ -67,13 +65,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Connector TAO_Connector::TAO_Connector (CORBA::ULong tag) - : active_connect_strategy_ (0), + : active_connect_strategy_ (nullptr), tag_ (tag), - orb_core_ (0) + orb_core_ (nullptr) { } -TAO_Connector::~TAO_Connector (void) +TAO_Connector::~TAO_Connector () { delete this->active_connect_strategy_; } @@ -82,14 +80,14 @@ TAO_Profile * TAO_Connector::corbaloc_scan (const char *str, size_t &len) { if (this->check_prefix (str) != 0) - return 0; + return nullptr; const char *comma_pos = ACE_OS::strchr (str,','); const char *slash_pos = ACE_OS::strchr (str,'/'); - if (comma_pos == 0 && slash_pos == 0) + if (comma_pos == nullptr && slash_pos == nullptr) { len = ACE_OS::strlen (str); } - else if (comma_pos == 0 || comma_pos > slash_pos) + else if (comma_pos == nullptr || comma_pos > slash_pos) len = (slash_pos - str); else len = comma_pos - str; return this->make_profile(); @@ -238,8 +236,7 @@ TAO_Connector::make_mprofile (const char *string, TAO_MProfile &mprofile) // Initialize a Profile using the individual endpoint // string. // @@ Not exception safe! We need a TAO_Profile_var! - profile->parse_string (endpoint.c_str () - ); + profile->parse_string (endpoint.c_str ()); // Give up ownership of the profile. if (mprofile.give_profile (profile) == -1) @@ -266,7 +263,7 @@ TAO_Connector::make_mprofile (const char *string, TAO_MProfile &mprofile) } int -TAO_Connector::supports_parallel_connects(void) const +TAO_Connector::supports_parallel_connects() const { return 0; // by default, we don't support parallel connection attempts; } @@ -276,7 +273,7 @@ TAO_Connector::make_parallel_connection (TAO::Profile_Transport_Resolver *, TAO_Transport_Descriptor_Interface &, ACE_Time_Value *) { - return 0; + return nullptr; } @@ -288,14 +285,14 @@ TAO_Connector::parallel_connect (TAO::Profile_Transport_Resolver *r, if (this->supports_parallel_connects() == 0) { errno = ENOTSUP; - return 0; + return nullptr; } errno = 0; // need to clear errno to ensure a stale enotsup is not set - if (desc == 0) - return 0; + if (desc == nullptr) + return nullptr; TAO_Endpoint *root_ep = desc->endpoint(); - TAO_Transport *base_transport = 0; + TAO_Transport *base_transport = nullptr; TAO::Transport_Cache_Manager &tcm = this->orb_core ()->lane_resources ().transport_cache (); @@ -303,8 +300,8 @@ TAO_Connector::parallel_connect (TAO::Profile_Transport_Resolver *r, // Iterate through the endpoints. Since find_transport takes a // Transport Descriptor rather than an endpoint, we must create a // local TDI for each endpoint. The first one found will be used. - for (TAO_Endpoint *ep = root_ep->next_filtered (this->orb_core(),0); - ep != 0; + for (TAO_Endpoint *ep = root_ep->next_filtered (this->orb_core(),nullptr); + ep != nullptr; ep = ep->next_filtered(this->orb_core(),root_ep)) { TAO_Base_Transport_Property desc2(ep,0); @@ -332,13 +329,13 @@ TAO_Connector::parallel_connect (TAO::Profile_Transport_Resolver *r, // when one succeeds the rest are cancelled or closed. unsigned int endpoint_count = 0; - for (TAO_Endpoint *ep = root_ep->next_filtered (this->orb_core(),0); - ep != 0; + for (TAO_Endpoint *ep = root_ep->next_filtered (this->orb_core(),nullptr); + ep != nullptr; ep = ep->next_filtered(this->orb_core(),root_ep)) if (this->set_validate_endpoint (ep) == 0) ++endpoint_count; if (endpoint_count == 0) - return 0; + return nullptr; return this->make_parallel_connection (r,*desc,timeout); } @@ -407,7 +404,7 @@ TAO_Connector::wait_for_transport (TAO::Profile_Transport_Resolver *r, // connection, the wait() call will block forever (or until the ORB // thread leaves the reactor, which may not happen). int result = 0; - if (timeout == 0 && !r->blocked_connect ()) + if (timeout == nullptr && !r->blocked_connect ()) { ACE_Time_Value tv (0, 500); result = this->active_connect_strategy_->wait (transport, &tv); @@ -491,7 +488,7 @@ TAO_Connector::connect (TAO::Profile_Transport_Resolver *r, { // Find a connection in the cache // If transport found, reference count is incremented on assignment - TAO_Transport *base_transport = 0; + TAO_Transport *base_transport = nullptr; size_t busy_count = 0; TAO::Transport_Cache_Manager::Find_Result found = tcm.find_transport (desc, @@ -570,7 +567,7 @@ TAO_Connector::connect (TAO::Profile_Transport_Resolver *r, "TAO (%P|%t) - Transport_Connector::connect," " wait for completion failed\n")); } - return 0; + return nullptr; } if (base_transport->is_connected () && @@ -585,7 +582,7 @@ TAO_Connector::connect (TAO::Profile_Transport_Resolver *r, "in the reactor.\n", base_transport->id ())); } - return 0; + return nullptr; } tg.clear (); @@ -614,7 +611,7 @@ TAO_Connector::connect (TAO::Profile_Transport_Resolver *r, if (!base_transport->register_if_necessary ()) { base_transport->remove_reference (); - return 0; + return nullptr; } } @@ -641,9 +638,9 @@ TAO_Connector::connect (TAO::Profile_Transport_Resolver *r, } else { - if (desc == 0 || + if (desc == nullptr || (this->set_validate_endpoint (desc->endpoint ()) == -1)) - return 0; + return nullptr; // @todo: This is not the right place for this! (bugzilla 3023) // Purge connections (if necessary) @@ -657,13 +654,13 @@ TAO_Connector::connect (TAO::Profile_Transport_Resolver *r, { // we aren't going to use the transport returned from the cache // (if any) - if (base_transport != 0) + if (base_transport != nullptr) { base_transport->remove_reference (); } base_transport = this->make_connection (r, *desc, timeout); - if (base_transport == 0) + if (base_transport == nullptr) { if (TAO_debug_level > 4) { @@ -671,7 +668,7 @@ TAO_Connector::connect (TAO::Profile_Transport_Resolver *r, ACE_TEXT ("TAO (%P|%t) - Transport_Connector::") ACE_TEXT ("connect, make_connection failed\n"))); } - return 0; + return nullptr; } if (TAO_debug_level > 4) @@ -817,7 +814,7 @@ TAO_Connector::wait_for_connection_completion ( { if (errno == ETIME) { - if (timeout == 0) + if (timeout == nullptr) { // There was an error during connecting and the errno was // ETIME. We didn't pass in a timeout, so there's @@ -876,7 +873,7 @@ TAO_Connector::wait_for_connection_completion ( // Set transport to zero, it is not usable, and the reference // count we added above was decremented by the base connector // handling the connection failure. - transport = 0; + transport = nullptr; return false; } // Connection not ready yet but we can use this transport, if @@ -929,7 +926,7 @@ TAO_Connector::wait_for_connection_completion ( if (r->blocked_connect ()) { result = this->active_connect_strategy_->wait (mev, timeout); - the_winner = 0; + the_winner = nullptr; } else { @@ -966,7 +963,7 @@ TAO_Connector::wait_for_connection_completion ( this->cleanup_pending (the_winner, transport, count); // In case of errors. - if (the_winner == 0) + if (the_winner == nullptr) { // Report that making the connection failed, don't print errno // because we touched the reactor and errno could be changed @@ -998,7 +995,7 @@ TAO_Connector::wait_for_connection_completion ( // Forget the return value. We are busted anyway. Try our best // here. (void) this->cancel_svc_handler (the_winner->connection_handler ()); - the_winner = 0; + the_winner = nullptr; return false; } @@ -1009,16 +1006,16 @@ TAO_Connector::wait_for_connection_completion ( } int -TAO_Connector::create_connect_strategy (void) +TAO_Connector::create_connect_strategy () { - if (this->active_connect_strategy_ == 0) + if (this->active_connect_strategy_ == nullptr) { this->active_connect_strategy_ = this->orb_core_->client_factory ()->create_connect_strategy ( this->orb_core_); } - if (this->active_connect_strategy_ == 0) + if (this->active_connect_strategy_ == nullptr) { return -1; } @@ -1029,7 +1026,7 @@ TAO_Connector::create_connect_strategy (void) bool TAO_Connector::new_connection_is_ok (size_t busy_count) { - if (this->orb_core_ == 0) + if (this->orb_core_ == nullptr) return true; unsigned int mux_limit = this->orb_core_->resource_factory () @@ -1091,6 +1088,4 @@ TAO_Connector::check_connection_closure ( return result; } -//@@ TAO_CONNECTOR_SPL_METHODS_ADD_HOOK - TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Transport_Connector.h b/TAO/tao/Transport_Connector.h index 292f451b3b7..b8aa3702d0e 100644 --- a/TAO/tao/Transport_Connector.h +++ b/TAO/tao/Transport_Connector.h @@ -45,12 +45,6 @@ namespace TAO class Profile_Transport_Resolver; } -/* - * Hook to add includes and forward declaration - * to the Connector class. - */ -//@@ TAO_CONNECTOR_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK - /** * @class TAO_Connector * @@ -123,8 +117,6 @@ public: /// Return the object key delimiter to use or expect. virtual char object_key_delimiter (void) const = 0; - //@@ TAO_CONNECTOR_SPL_PUBLIC_METHODS_ADD_HOOK - protected: /// A flag indicating the actual connector supports parallel connection /// attempts. The base implementation always returns 0. Override to return @@ -216,23 +208,17 @@ protected: TAO_ORB_Core *orb_core (void); protected: - /// The (a)synch connect strategy TAO_Connect_Strategy *active_connect_strategy_; private: - /// IOP protocol tag. CORBA::ULong const tag_; /// Pointer to our ORB core TAO_ORB_Core *orb_core_; - - //@@ TAO_CONNECTOR_SPL_PRIVATE_DATA_ADD_HOOK }; -//@@ TAO_CONNECTOR_SPL_EXTERN_ADD_HOOK - TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) diff --git a/TAO/tao/Transport_Descriptor_Interface.cpp b/TAO/tao/Transport_Descriptor_Interface.cpp index fe038e33c63..7cfe705188f 100644 --- a/TAO/tao/Transport_Descriptor_Interface.cpp +++ b/TAO/tao/Transport_Descriptor_Interface.cpp @@ -8,7 +8,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Transport_Descriptor_Interface::~TAO_Transport_Descriptor_Interface (void) +TAO_Transport_Descriptor_Interface::~TAO_Transport_Descriptor_Interface () { if (this->release_) { @@ -23,7 +23,7 @@ TAO_Transport_Descriptor_Interface::reset_endpoint (TAO_Endpoint *ep) if (this->release_) return false; - for (TAO_Endpoint *ptr = this->endpoint_; ptr != 0; ptr = ptr->next()) + for (TAO_Endpoint *ptr = this->endpoint_; ptr != nullptr; ptr = ptr->next()) if (ptr == ep) { diff --git a/TAO/tao/Transport_Mux_Strategy.cpp b/TAO/tao/Transport_Mux_Strategy.cpp index f2c3d15618a..47c6156fede 100644 --- a/TAO/tao/Transport_Mux_Strategy.cpp +++ b/TAO/tao/Transport_Mux_Strategy.cpp @@ -8,7 +8,7 @@ TAO_Transport_Mux_Strategy::TAO_Transport_Mux_Strategy ( { } -TAO_Transport_Mux_Strategy::~TAO_Transport_Mux_Strategy (void) +TAO_Transport_Mux_Strategy::~TAO_Transport_Mux_Strategy () { } diff --git a/TAO/tao/Transport_Mux_Strategy.h b/TAO/tao/Transport_Mux_Strategy.h index 45f76ce4c43..301f9bc496c 100644 --- a/TAO/tao/Transport_Mux_Strategy.h +++ b/TAO/tao/Transport_Mux_Strategy.h @@ -36,17 +36,16 @@ class TAO_Pluggable_Reply_Params; */ class TAO_Export TAO_Transport_Mux_Strategy { - public: /// Base class constructor. TAO_Transport_Mux_Strategy (TAO_Transport *transport); /// Base class destructor. - virtual ~TAO_Transport_Mux_Strategy (void); + virtual ~TAO_Transport_Mux_Strategy (); /// Generate and return an unique request id for the current /// invocation. - virtual CORBA::ULong request_id (void) = 0; + virtual CORBA::ULong request_id () = 0; /// Bind the dispatcher with the request id. Commonalities in the /// derived class implementations is kept here. @@ -74,19 +73,19 @@ public: /// Request has been just sent, but the reply is not received. Idle /// the transport now. The return value indicates whether idling was /// successful or not. - virtual bool idle_after_send (void) = 0; + virtual bool idle_after_send () = 0; /// Request is sent and the reply is received. Idle the transport /// now. The return value indicates whether idling was successful or /// not. - virtual bool idle_after_reply (void) = 0; + virtual bool idle_after_reply () = 0; /// The transport object has closed the connection, inform all Reply /// dispatchers and waiting strategies. - virtual void connection_closed (void) = 0; + virtual void connection_closed () = 0; /// Do we have a request pending - virtual bool has_request (void) = 0; + virtual bool has_request () = 0; protected: /// Cache the transport reference. diff --git a/TAO/tao/Transport_Queueing_Strategies.cpp b/TAO/tao/Transport_Queueing_Strategies.cpp index 6343041843d..c6a41562673 100644 --- a/TAO/tao/Transport_Queueing_Strategies.cpp +++ b/TAO/tao/Transport_Queueing_Strategies.cpp @@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - Transport_Queueing_Strategy::~Transport_Queueing_Strategy (void) + Transport_Queueing_Strategy::~Transport_Queueing_Strategy () { } diff --git a/TAO/tao/Transport_Queueing_Strategies.h b/TAO/tao/Transport_Queueing_Strategies.h index b145ba57988..45a8dda4a6c 100644 --- a/TAO/tao/Transport_Queueing_Strategies.h +++ b/TAO/tao/Transport_Queueing_Strategies.h @@ -48,7 +48,7 @@ namespace TAO { public: /// Destructor - virtual ~Transport_Queueing_Strategy (void); + virtual ~Transport_Queueing_Strategy (); /// Return true if a message must be queued virtual bool must_queue (bool queue_empty) const = 0; diff --git a/TAO/tao/Transport_Selection_Guard.cpp b/TAO/tao/Transport_Selection_Guard.cpp index a3d12a0544a..cd79ab92d66 100644 --- a/TAO/tao/Transport_Selection_Guard.cpp +++ b/TAO/tao/Transport_Selection_Guard.cpp @@ -44,13 +44,13 @@ namespace TAO } /// Dtor - Transport_Selection_Guard::~Transport_Selection_Guard (void) + Transport_Selection_Guard::~Transport_Selection_Guard () { #if TAO_HAS_TRANSPORT_CURRENT == 1 TAO_TSS_Resources::instance ()->tsg_ = prev_; - this->prev_ = 0; + this->prev_ = nullptr; #endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */ - this->curr_ = 0; + this->curr_ = nullptr; } bool diff --git a/TAO/tao/Transport_Selection_Guard.h b/TAO/tao/Transport_Selection_Guard.h index fbc520aea4e..fa70136f350 100644 --- a/TAO/tao/Transport_Selection_Guard.h +++ b/TAO/tao/Transport_Selection_Guard.h @@ -64,22 +64,22 @@ namespace TAO Transport_Selection_Guard (TAO_Transport* t); /// Dtor - ~Transport_Selection_Guard (void); + ~Transport_Selection_Guard (); /// getter - TAO_Transport* operator-> (void) const + TAO_Transport* operator-> () const { return this->get (); }; /// getter - TAO_Transport& operator* (void) const + TAO_Transport& operator* () const { return *this->get (); }; /// Getter - TAO_Transport* get (void) const + TAO_Transport* get () const { return this->curr_; }; diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp index c1e11a1484c..ee4e1641e7e 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp @@ -251,8 +251,7 @@ TAO_TypeCodeFactory_i::create_union_tc ( CORBA::TypeCode_var const tmp = member.label.type (); CORBA::Boolean const equiv = - discriminator_type->equivalent (tmp.in () - ); + discriminator_type->equivalent (tmp.in ()); if (!equiv) { @@ -266,8 +265,7 @@ TAO_TypeCodeFactory_i::create_union_tc ( CORBA::Boolean const unique_labels = this->unique_label_values (members, discriminator_type, - raw_default_index - ); + raw_default_index); if (!unique_labels) { @@ -746,8 +744,7 @@ TAO_TypeCodeFactory_i::create_value_tc ( type_modifier, concrete_base, members, - CORBA::tk_value - ); + CORBA::tk_value); } CORBA::TypeCode_ptr @@ -799,27 +796,23 @@ TAO_TypeCodeFactory_i::create_abstract_interface_tc ( { return this->create_tc_common (id, name, - CORBA::tk_abstract_interface - ); + CORBA::tk_abstract_interface); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_local_interface_tc ( const char *id, - const char *name - ) + const char *name) { return this->create_tc_common (id, name, - CORBA::tk_local_interface - ); + CORBA::tk_local_interface); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_component_tc ( const char *id, - const char *name - ) + const char *name) { return this->create_tc_common (id, name, @@ -1216,8 +1209,7 @@ TAO_TypeCodeFactory_i::struct_except_tc_common ( CORBA::TypeCode_ptr const member_tc = members[index].type.in (); CORBA::Boolean const valid_member = - this->valid_content_type (member_tc - ); + this->valid_content_type (member_tc); if (!valid_member) { @@ -1534,12 +1526,10 @@ CORBA::Boolean TAO_TypeCodeFactory_i::unique_label_values ( const CORBA::UnionMemberSeq &members, CORBA::TypeCode_ptr disc_tc, - CORBA::ULong default_index_slot - ) + CORBA::ULong default_index_slot) { - CORBA::TCKind disc_kind = disc_tc->kind (); - - CORBA::ULong length = members.length (); + CORBA::TCKind const disc_kind = disc_tc->kind (); + CORBA::ULong const length = members.length (); // We have already checked for valid discriminator type // and valid label types, so we won't check for any of that here. @@ -1689,8 +1679,7 @@ TAO_TypeCodeFactory_i::unique_label_values ( } CORBA::Boolean -TAO_TypeCodeFactory_i::valid_disc_type (CORBA::TypeCode_ptr tc - ) +TAO_TypeCodeFactory_i::valid_disc_type (CORBA::TypeCode_ptr tc) { CORBA::TCKind const kind = tc->kind (); diff --git a/TAO/tao/TypeCodeFactory_Adapter.cpp b/TAO/tao/TypeCodeFactory_Adapter.cpp index ed855ffc906..cb97ddae79e 100644 --- a/TAO/tao/TypeCodeFactory_Adapter.cpp +++ b/TAO/tao/TypeCodeFactory_Adapter.cpp @@ -2,7 +2,7 @@ #include "ace/Dynamic_Service.h" -TAO_TypeCodeFactory_Adapter::~TAO_TypeCodeFactory_Adapter (void) +TAO_TypeCodeFactory_Adapter::~TAO_TypeCodeFactory_Adapter () { } diff --git a/TAO/tao/TypeCodeFactory_Adapter.h b/TAO/tao/TypeCodeFactory_Adapter.h index 6091692a48b..2f065c382d6 100644 --- a/TAO/tao/TypeCodeFactory_Adapter.h +++ b/TAO/tao/TypeCodeFactory_Adapter.h @@ -64,7 +64,7 @@ namespace TAO class TAO_Export TAO_TypeCodeFactory_Adapter : public ACE_Service_Object { public: - virtual ~TAO_TypeCodeFactory_Adapter (void); + virtual ~TAO_TypeCodeFactory_Adapter (); virtual CORBA::TypeCode_ptr create_struct_tc ( const char *id, diff --git a/TAO/tao/UB_String_Argument_T.h b/TAO/tao/UB_String_Argument_T.h index fb5f23cb076..5221d90c31f 100644 --- a/TAO/tao/UB_String_Argument_T.h +++ b/TAO/tao/UB_String_Argument_T.h @@ -42,7 +42,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - const typename S_var::s_traits::char_type * arg (void) const; + const typename S_var::s_traits::char_type * arg () const; protected: typename S_var::s_traits::char_type const * x_; @@ -61,9 +61,9 @@ namespace TAO { public: In_UB_String_Clonable_Argument_T (const typename S_var::s_traits::char_type * x); - virtual ~In_UB_String_Clonable_Argument_T (void); + virtual ~In_UB_String_Clonable_Argument_T (); - virtual Argument* clone (void); + virtual Argument* clone (); private: bool is_clone_; @@ -87,7 +87,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - typename S_var::s_traits::char_type *& arg (void); + typename S_var::s_traits::char_type *& arg (); private: typename S_var::s_traits::char_type *& x_; @@ -110,7 +110,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - typename S_var::s_traits::char_type *& arg (void); + typename S_var::s_traits::char_type *& arg (); private: typename S_var::s_traits::char_type *& x_; @@ -127,15 +127,15 @@ namespace TAO class Ret_UB_String_Argument_T : public RetArgument { public: - Ret_UB_String_Argument_T (void); + Ret_UB_String_Argument_T (); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - typename S_var::s_traits::char_type *& arg (void); - typename S_var::s_traits::char_type * excp (void); - typename S_var::s_traits::char_type * retn (void); + typename S_var::s_traits::char_type *& arg (); + typename S_var::s_traits::char_type * excp (); + typename S_var::s_traits::char_type * retn (); private: S_var x_; diff --git a/TAO/tao/Unbounded_Basic_String_Sequence_T.h b/TAO/tao/Unbounded_Basic_String_Sequence_T.h index 3dcac56a8b8..c6839076d9d 100644 --- a/TAO/tao/Unbounded_Basic_String_Sequence_T.h +++ b/TAO/tao/Unbounded_Basic_String_Sequence_T.h @@ -12,7 +12,6 @@ #include "tao/Generic_Sequence_T.h" #include "tao/String_Sequence_Element_T.h" #include "tao/String_Const_Sequence_Element_T.h" -#include "tao/MM_Sequence_Iterator_T.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -112,117 +111,9 @@ public: implementation_type::freebuf(buffer); } - -#if defined TAO_HAS_SEQUENCE_ITERATORS && TAO_HAS_SEQUENCE_ITERATORS == 1 - - /// - /// Additions to support iterator semantics for TAO unbounded basic - /// string sequences. - /// - - // = Traits and factory methods that create iterators. - typedef MM_Sequence_Iterator<unbounded_basic_string_sequence<charT> > iterator; - typedef Const_MM_Sequence_Iterator<unbounded_basic_string_sequence<charT> > const_iterator; - typedef MM_Sequence_Reverse_Iterator<unbounded_basic_string_sequence<charT> > reverse_iterator; - typedef Const_MM_Sequence_Reverse_Iterator<unbounded_basic_string_sequence<charT> > const_reverse_iterator; - - /// Get an iterator that points to the beginning of the sequence. - inline iterator begin (void) - { - return iterator (&this->impl_); - } - - /// Get a const iterator that points to the beginning of the sequence. - inline const_iterator begin (void) const - { - return const_iterator (&this->impl_); - } - - /// Get an iterator that points to the end of the sequence. - inline iterator end (void) - { - return iterator (&this->impl_, - this->impl_.length ()); - } - - /// Get a const iterator that points to the end of the sequence. - inline const_iterator end (void) const - { - return const_iterator (&this->impl_, - this->impl_.length ()); - } - - /// Get a reverse iterator that points to the end of the sequence. - inline reverse_iterator rbegin (void) - { - return reverse_iterator (&this->impl_, - this->impl_.length () - 1); - } - - /// Get a const reverse iterator that points to the end of the sequence. - inline const_reverse_iterator rbegin (void) const - { - return const_reverse_iterator (&this->impl_, - this->impl_.length () - 1); - } - - /// Get a reverse iterator that points to one before the beginning - /// of the sequence. - inline reverse_iterator rend (void) - { - return reverse_iterator (&this->impl_, - -1); - } - - /// Get a const reverse iterator that points to one before the - /// beginning of the sequence. - inline const_reverse_iterator rend (void) const - { - return const_reverse_iterator (&this->impl_, - -1); - } - -#endif /* TAO_HAS_SEQUENCE_ITERATORS==1 */ - private: implementation_type impl_; }; - -#if defined TAO_HAS_SEQUENCE_ITERATORS && TAO_HAS_SEQUENCE_ITERATORS == 1 -/* -// Below is an attempt at template specialization that would -// not compile. It might be useful later. -// Generic_Sequence_Iterator template specializations for -// Unbounded_Basic_String_Sequence. These are needed since -// Unbounded_Basic_String_Sequence does some memory management with -// the strings. Without these specialization we leak memory. - -/// Dereference operator returns a reference to the item contained -/// at the current position. This dereference implies string -/// memory management. -// template<typename charT> - unbounded_basic_string_sequence<char>::element_type& - details::Generic_Sequence_Iterator<unbounded_basic_string_sequence<char>, unbounded_basic_string_sequence::allocation_traits, unbounded_basic_string_sequence::element_traits >::operator* (void) - { - // Access the underlying element in the sequence. - //return element_type (impl_[i], release()); - return element_type ((*(this->sequence_))[this->pos_], - this->sequence_->release()); - } - - /// Returns a const reference to the item contained at the current position - // template<typename charT> - unbounded_basic_string_sequence<char>::const_element_type& - details::Generic_Sequence_Iterator<unbounded_basic_string_sequence<char> >::operator* (void) const - { - // Access the underlying element in the sequence. - //return const_element_type (impl_[i], release()); - return const_element_type ((*(this->sequence_))[this->pos_], - this->sequence_->release ()); - } -*/ -#endif /* TAO_HAS_SEQUENCE_ITERATORS==1 */ - } // namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Unbounded_Object_Reference_Sequence_T.h b/TAO/tao/Unbounded_Object_Reference_Sequence_T.h index 1f63609def6..cbbb8a59336 100644 --- a/TAO/tao/Unbounded_Object_Reference_Sequence_T.h +++ b/TAO/tao/Unbounded_Object_Reference_Sequence_T.h @@ -12,7 +12,6 @@ #include "Generic_Sequence_T.h" #include "Object_Reference_Sequence_Element_T.h" #include "Object_Reference_Const_Sequence_Element_T.h" -#include "tao/MM_Sequence_Iterator_T.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -107,73 +106,6 @@ public: implementation_type::freebuf(buffer); } -#if defined TAO_HAS_SEQUENCE_ITERATORS && TAO_HAS_SEQUENCE_ITERATORS == 1 - /// Additions to support iterator semantics for TAO unbounded object reference - /// sequences. - - // = Traits and factory methods that create iterators. - typedef MM_Sequence_Iterator<unbounded_object_reference_sequence<object_t, object_t_var> > iterator; - typedef Const_MM_Sequence_Iterator<unbounded_object_reference_sequence<object_t, object_t_var> > const_iterator; - typedef MM_Sequence_Reverse_Iterator<unbounded_object_reference_sequence<object_t, object_t_var> > reverse_iterator; - typedef Const_MM_Sequence_Reverse_Iterator<unbounded_object_reference_sequence<object_t, object_t_var> > const_reverse_iterator; - - /// Get an iterator that points to the beginning of the sequence. - iterator begin (void) - { - return iterator (&this->impl_); - } - - /// Get a const iterator that points to the beginning of the sequence. - const_iterator begin (void) const - { - return const_iterator (&this->impl_); - } - - /// Get an iterator that points to the end of the sequence. - iterator end (void) - { - return iterator (&this->impl_, - this->impl_.length ()); - } - - /// Get a const iterator that points to the end of the sequence. - const_iterator end (void) const - { - return const_iterator (&this->impl_, - this->impl_.length ()); - } - - /// Get a reverse iterator that points to the end of the sequence. - reverse_iterator rbegin (void) - { - return reverse_iterator (&this->impl_, - this->impl_.length () - 1); - } - - /// Get a const reverse iterator that points to the end of the sequence. - const_reverse_iterator rbegin (void) const - { - return const_reverse_iterator (&this->impl_, - this->impl_.length () - 1); - } - - /// Get a reverse iterator that points to one before the beginning - /// of the sequence. - reverse_iterator rend (void) - { - return reverse_iterator (&this->impl_, - -1); - } - - /// Get a const reverse iterator that points to one before the - /// beginning of the sequence. - const_reverse_iterator rend (void) const - { - return const_reverse_iterator (&this->impl_, - -1); - } -#endif /* TAO_HAS_SEQUENCE_ITERATORS==1 */ - private: implementation_type impl_; }; diff --git a/TAO/tao/Unbounded_Octet_Sequence_T.h b/TAO/tao/Unbounded_Octet_Sequence_T.h index c3ec3ec5bbd..d50b8b8be03 100644 --- a/TAO/tao/Unbounded_Octet_Sequence_T.h +++ b/TAO/tao/Unbounded_Octet_Sequence_T.h @@ -239,7 +239,7 @@ public: /// Returns the underlying message block, the caller must *not* /// release the copy. - inline ACE_Message_Block* mb (void) const { + inline ACE_Message_Block* mb () const { return mb_; } diff --git a/TAO/tao/Unbounded_Value_Sequence_T.h b/TAO/tao/Unbounded_Value_Sequence_T.h index c3b5a53e60c..a82aa26e6c4 100644 --- a/TAO/tao/Unbounded_Value_Sequence_T.h +++ b/TAO/tao/Unbounded_Value_Sequence_T.h @@ -88,71 +88,6 @@ public: implementation_type::freebuf(buffer); } -#if defined TAO_HAS_SEQUENCE_ITERATORS && TAO_HAS_SEQUENCE_ITERATORS == 1 - - /// - /// Additions to support iterator semantics for TAO unbounded value - /// sequences. - /// - - // = Traits and factory methods that create iterators. - typedef details::Generic_Sequence_Iterator<details::generic_sequence<value_type, allocation_traits, element_traits> > iterator; - typedef details::Const_Generic_Sequence_Iterator<details::generic_sequence<value_type, allocation_traits, element_traits> > const_iterator; - typedef details::Generic_Sequence_Reverse_Iterator<details::generic_sequence<value_type, allocation_traits, element_traits> > reverse_iterator; - typedef details::Const_Generic_Sequence_Reverse_Iterator<details::generic_sequence<value_type, allocation_traits, element_traits> > const_reverse_iterator; - - // Get an iterator that points to the beginning of the sequence. - iterator begin (void) - { - return impl_.begin (); - } - - // Get a const iterator that points to the beginning of the sequence. - const_iterator begin (void) const - { - return impl_.begin (); - } - - // Get an iterator that points to the end of the sequence. - iterator end (void) - { - return impl_.end (); - } - - // Get a const iterator that points to the end of the sequence. - const_iterator end (void) const - { - return impl_.end (); - } - - // Get a reverse iterator that points to the end of the sequence. - reverse_iterator rbegin (void) - { - return impl_.rbegin (); - } - - // Get a const reverse iterator that points to the end of the sequence. - const_reverse_iterator rbegin (void) const - { - return impl_.rbegin (); - } - - // Get a reverse iterator that points to one before the beginning - // of the sequence. - reverse_iterator rend (void) - { - return impl_.rend (); - } - - // Get a const reverse iterator that points to one before the - // beginning of the sequence. - const_reverse_iterator rend (void) const - { - return impl_.rend (); - } - -#endif /* TAO_HAS_SEQUENCE_ITERATORS==1 */ - private: implementation_type impl_; }; diff --git a/TAO/tao/UserException.cpp b/TAO/tao/UserException.cpp index 34bf89289d5..590916c2753 100644 --- a/TAO/tao/UserException.cpp +++ b/TAO/tao/UserException.cpp @@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Virtual. Do not inline. -CORBA::UserException::~UserException (void) +CORBA::UserException::~UserException () { } @@ -23,13 +23,13 @@ CORBA::UserException::operator= (CORBA::UserException const & rhs) // Virtual. Do not inline. CORBA::TypeCode_ptr -CORBA::UserException::_tao_type (void) const +CORBA::UserException::_tao_type () const { - return 0; + return nullptr; } ACE_CString -CORBA::UserException::_info (void) const +CORBA::UserException::_info () const { // @@ we can use the exception's typecode to dump all the data held // within it ... diff --git a/TAO/tao/UserException.h b/TAO/tao/UserException.h index f2461dd1142..6869abd5a47 100644 --- a/TAO/tao/UserException.h +++ b/TAO/tao/UserException.h @@ -44,7 +44,7 @@ namespace CORBA UserException (UserException const &rhs); /// Destructor. - virtual ~UserException (void); + virtual ~UserException (); /// Assignment operator. UserException &operator= (UserException const &rhs); @@ -55,9 +55,9 @@ namespace CORBA /// The const version of narrow operation static const UserException *_downcast (CORBA::Exception const *exception); - virtual void _raise (void) const = 0; + virtual void _raise () const = 0; - virtual CORBA::TypeCode_ptr _tao_type (void) const; + virtual CORBA::TypeCode_ptr _tao_type () const; // = TAO specific extension. @@ -66,11 +66,11 @@ namespace CORBA /// Returns a string containing information about the exception. This /// function is not CORBA compliant. - virtual ACE_CString _info (void) const; + virtual ACE_CString _info () const; protected: /// Default constructor. - UserException (void); + UserException (); }; } diff --git a/TAO/tao/Valuetype/AbstractBase.h b/TAO/tao/Valuetype/AbstractBase.h index d23b249e062..f9825071858 100644 --- a/TAO/tao/Valuetype/AbstractBase.h +++ b/TAO/tao/Valuetype/AbstractBase.h @@ -25,11 +25,7 @@ #include "tao/Objref_VarOut_T.h" #include "tao/Object.h" /* For CORBA::Object_var */ #include "tao/Pseudo_VarOut_T.h" -#if defined (ACE_HAS_CPP11) -# include <atomic> -#else -# include "ace/Atomic_Op.h" -#endif /* ACE_HAS_CPP11 */ +#include <atomic> TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -55,7 +51,6 @@ namespace CORBA class TAO_Valuetype_Export AbstractBase { public: - /// Constructor. /** * This constructor is only meant to be called by the @@ -72,21 +67,21 @@ namespace CORBA static CORBA::AbstractBase_ptr _narrow (CORBA::AbstractBase_ptr obj); static CORBA::AbstractBase_ptr _duplicate (CORBA::AbstractBase_ptr obj); - static CORBA::AbstractBase_ptr _nil (void); + static CORBA::AbstractBase_ptr _nil (); /// Used in the implementation of CORBA::Any static void _tao_any_destructor (void*); /// Spec required conversion operations - CORBA::Object_ptr _to_object (void); - CORBA::ValueBase *_to_value (void); + CORBA::Object_ptr _to_object (); + CORBA::ValueBase *_to_value (); virtual CORBA::Boolean _is_a (const char *type_id); - virtual const char* _interface_repository_id (void) const; + virtual const char* _interface_repository_id () const; /// TAO specific operations - virtual const char* _tao_obv_repository_id (void) const; + virtual const char* _tao_obv_repository_id () const; virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &) const; virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &); virtual CORBA::Boolean _tao_match_formal_type (ptrdiff_t) const; @@ -102,17 +97,17 @@ namespace CORBA #endif /* GEN_OSTREAM_OPS */ /// Memory management operations - virtual void _add_ref (void); - virtual void _remove_ref (void); + virtual void _add_ref (); + virtual void _remove_ref (); - CORBA::Boolean _is_objref (void) const; + CORBA::Boolean _is_objref () const; /// Return the stub object - TAO_Stub *_stubobj (void) const; + TAO_Stub *_stubobj () const; /// Acessors - CORBA::Boolean _is_collocated (void) const; - TAO_Abstract_ServantBase *_servant (void) const; + CORBA::Boolean _is_collocated () const; + TAO_Abstract_ServantBase *_servant () const; /// Return the equivalent object reference. /** @@ -120,39 +115,32 @@ namespace CORBA * a var or some such thing. The memory is owned by @c this * object. */ - CORBA::Object_ptr equivalent_objref (void); + CORBA::Object_ptr equivalent_objref (); /// Wrapper for _remove_ref(), naming convention for /// templatizing. - void _decr_refcount (void); + void _decr_refcount (); protected: - - AbstractBase (void); + AbstractBase (); AbstractBase (const AbstractBase &); - virtual ~AbstractBase (void); + virtual ~AbstractBase (); protected: CORBA::Boolean is_objref_; private: - AbstractBase & operator= (const AbstractBase &); - virtual CORBA::ValueBase *_tao_to_value (void); + virtual CORBA::ValueBase *_tao_to_value (); CORBA::Object_ptr create_object (TAO_Stub *stub); private: - /// Number of outstanding references to this object. -#if defined (ACE_HAS_CPP11) std::atomic<uint32_t> refcount_; -#else - ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; -#endif /* ACE_HAS_CPP11 */ CORBA::Boolean is_collocated_; TAO_Abstract_ServantBase *servant_; diff --git a/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h b/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h index 1b348223320..4522590249d 100644 --- a/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h +++ b/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h @@ -58,11 +58,10 @@ namespace TAO // Don't allow default initializations AbstractBase_Invocation_Adapter (void); - // Disallow copying and assignment. - AbstractBase_Invocation_Adapter (const AbstractBase_Invocation_Adapter &); - AbstractBase_Invocation_Adapter & operator= ( - const AbstractBase_Invocation_Adapter &); - + AbstractBase_Invocation_Adapter (const AbstractBase_Invocation_Adapter &) = delete; + AbstractBase_Invocation_Adapter & operator= (const AbstractBase_Invocation_Adapter &) = delete; + AbstractBase_Invocation_Adapter (AbstractBase_Invocation_Adapter &&) = delete; + AbstractBase_Invocation_Adapter & operator= (AbstractBase_Invocation_Adapter &&) = delete; }; } // End namespace TAO diff --git a/TAO/tao/Valuetype/Bounded_Valuetype_Sequence_T.h b/TAO/tao/Valuetype/Bounded_Valuetype_Sequence_T.h index 4f8556a5630..4ec02bb7989 100644 --- a/TAO/tao/Valuetype/Bounded_Valuetype_Sequence_T.h +++ b/TAO/tao/Valuetype/Bounded_Valuetype_Sequence_T.h @@ -11,7 +11,6 @@ #include "Valuetype_Traits_T.h" #include "tao/Generic_Sequence_T.h" #include "Valuetype_Sequence_Element_T.h" -#include "tao/MM_Sequence_Iterator_T.h" #include "tao/Bounded_Reference_Allocation_Traits_T.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -98,78 +97,6 @@ public: implementation_type::freebuf(buffer); } -#if defined TAO_HAS_SEQUENCE_ITERATORS && TAO_HAS_SEQUENCE_ITERATORS == 1 - - /// - /// Additions to support iterator semantics for TAO bounded value type - /// sequences. - /// - - // = Traits and factory methods that create iterators. - typedef MM_Sequence_Iterator<bounded_valuetype_sequence<object_t, object_t_var, MAX> > iterator; - typedef Const_MM_Sequence_Iterator<bounded_valuetype_sequence<object_t, object_t_var, MAX> > const_iterator; - typedef MM_Sequence_Reverse_Iterator<bounded_valuetype_sequence<object_t, object_t_var, MAX> > reverse_iterator; - typedef Const_MM_Sequence_Reverse_Iterator<bounded_valuetype_sequence<object_t, object_t_var, MAX> > const_reverse_iterator; - - // Get an iterator that points to the beginning of the sequence. - inline iterator begin (void) - { - return iterator (&this->impl_); - } - - // Get a const iterator that points to the beginning of the sequence. - inline const_iterator begin (void) const - { - return const_iterator (&this->impl_); - } - - // Get an iterator that points to the end of the sequence. - inline iterator end (void) - { - return iterator (&this->impl_, - this->impl_.length ()); - } - - // Get a const iterator that points to the end of the sequence. - inline const_iterator end (void) const - { - return const_iterator (&this->impl_, - this->impl_.length ()); - } - - // Get a reverse iterator that points to the end of the sequence. - inline reverse_iterator rbegin (void) - { - return reverse_iterator (&this->impl_, - this->impl_.length () - 1); - } - - // Get a const reverse iterator that points to the end of the sequence. - inline const_reverse_iterator rbegin (void) const - { - return const_reverse_iterator (&this->impl_, - this->impl_.length () - 1); - } - - // Get a reverse iterator that points to one before the beginning - // of the sequence. - inline reverse_iterator rend (void) - { - return reverse_iterator (&this->impl_, - -1); - } - - // Get a const reverse iterator that points to one before the - // beginning of the sequence. - inline const_reverse_iterator rend (void) const - { - return const_reverse_iterator (&this->impl_, - -1); - } - -#endif /* TAO_HAS_SEQUENCE_ITERATORS==1 */ - - private: implementation_type impl_; }; diff --git a/TAO/tao/Valuetype/Unbounded_Valuetype_Sequence_T.h b/TAO/tao/Valuetype/Unbounded_Valuetype_Sequence_T.h index 2055ec0b1d7..72a64f3a308 100644 --- a/TAO/tao/Valuetype/Unbounded_Valuetype_Sequence_T.h +++ b/TAO/tao/Valuetype/Unbounded_Valuetype_Sequence_T.h @@ -11,7 +11,6 @@ #include "Valuetype_Traits_T.h" #include "tao/Generic_Sequence_T.h" #include "Valuetype_Sequence_Element_T.h" -#include "tao/MM_Sequence_Iterator_T.h" #include "tao/Unbounded_Reference_Allocation_Traits_T.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -97,78 +96,6 @@ public: implementation_type::freebuf(buffer); } -#if defined TAO_HAS_SEQUENCE_ITERATORS && TAO_HAS_SEQUENCE_ITERATORS == 1 - - /// - /// Additions to support iterator semantics for TAO unbounded value type - /// sequences. - /// - - // = Traits and factory methods that create iterators. - typedef MM_Sequence_Iterator<unbounded_valuetype_sequence<object_t, object_t_var> > iterator; - typedef Const_MM_Sequence_Iterator<unbounded_valuetype_sequence<object_t, object_t_var> > const_iterator; - typedef MM_Sequence_Reverse_Iterator<unbounded_valuetype_sequence<object_t, object_t_var> > reverse_iterator; - typedef Const_MM_Sequence_Reverse_Iterator<unbounded_valuetype_sequence<object_t, object_t_var> > const_reverse_iterator; - - // Get an iterator that points to the beginning of the sequence. - inline iterator begin (void) - { - return iterator (&this->impl_); - } - - // Get a const iterator that points to the beginning of the sequence. - inline const_iterator begin (void) const - { - return const_iterator (&this->impl_); - } - - // Get an iterator that points to the end of the sequence. - inline iterator end (void) - { - return iterator (&this->impl_, - this->impl_.length ()); - } - - // Get a const iterator that points to the end of the sequence. - inline const_iterator end (void) const - { - return const_iterator (&this->impl_, - this->impl_.length ()); - } - - // Get a reverse iterator that points to the end of the sequence. - inline reverse_iterator rbegin (void) - { - return reverse_iterator (&this->impl_, - this->impl_.length () - 1); - } - - // Get a const reverse iterator that points to the end of the sequence. - inline const_reverse_iterator rbegin (void) const - { - return const_reverse_iterator (&this->impl_, - this->impl_.length () - 1); - } - - // Get a reverse iterator that points to one before the beginning - // of the sequence. - inline reverse_iterator rend (void) - { - return reverse_iterator (&this->impl_, - -1); - } - - // Get a const reverse iterator that points to one before the - // beginning of the sequence. - inline const_reverse_iterator rend (void) const - { - return const_reverse_iterator (&this->impl_, - -1); - } - -#endif /* TAO_HAS_SEQUENCE_ITERATORS==1 */ - - private: implementation_type impl_; }; diff --git a/TAO/tao/Valuetype/ValueBase.cpp b/TAO/tao/Valuetype/ValueBase.cpp index dd0a46c847e..0f4f33161b6 100644 --- a/TAO/tao/Valuetype/ValueBase.cpp +++ b/TAO/tao/Valuetype/ValueBase.cpp @@ -1428,11 +1428,7 @@ CORBA::DefaultValueRefCountBase::_tao_remove_ref (void) CORBA::ULong CORBA::DefaultValueRefCountBase::_tao_refcount_value (void) const { -#if defined (ACE_HAS_CPP11) return this->refcount_; -#else - return this->refcount_.value (); -#endif /* ACE_HAS_CPP11 */ } // =========================================================== diff --git a/TAO/tao/Valuetype/ValueBase.h b/TAO/tao/Valuetype/ValueBase.h index 25a68b6e00a..add847fabef 100644 --- a/TAO/tao/Valuetype/ValueBase.h +++ b/TAO/tao/Valuetype/ValueBase.h @@ -30,11 +30,7 @@ #include "ace/Basic_Types.h" #include "ace/Synch_Traits.h" #include "ace/Thread_Mutex.h" -#if defined (ACE_HAS_CPP11) -# include <atomic> -#else -# include "ace/Atomic_Op.h" -#endif /* ACE_HAS_CPP11 */ +#include <atomic> #include "ace/Null_Mutex.h" #include "ace/Vector_T.h" @@ -147,12 +143,12 @@ namespace CORBA typedef ACE_Vector < ACE_CString > Repository_Id_List; - virtual CORBA::ValueBase* _copy_value (void) TAO_local_COPY_VALUE_IS_PURE; + virtual CORBA::ValueBase* _copy_value () TAO_local_COPY_VALUE_IS_PURE; // Reference counting. - virtual void _add_ref (void) = 0; - virtual void _remove_ref (void) = 0; - virtual CORBA::ULong _refcount_value (void) = 0; + virtual void _add_ref () = 0; + virtual void _remove_ref () = 0; + virtual CORBA::ULong _refcount_value () = 0; // dynamic casting static CORBA::ValueBase* _downcast (CORBA::ValueBase *); @@ -161,10 +157,10 @@ namespace CORBA /// Used in the implementation of CORBA::Any static void _tao_any_destructor (void *); - virtual CORBA::TypeCode_ptr _tao_type (void) const = 0; + virtual CORBA::TypeCode_ptr _tao_type () const = 0; /// Return the repository id of this valuetype. - virtual const char * _tao_obv_repository_id (void) const = 0; + virtual const char * _tao_obv_repository_id () const = 0; /// Give the list of the RepositoryIds in the valuetype "truncatable" /// inheritance hierarchy. List the id of this valuetype as first @@ -238,9 +234,9 @@ namespace CORBA virtual void truncation_hook (); protected: - ValueBase (void); + ValueBase (); ValueBase (const ValueBase&); - virtual ~ValueBase (void); + virtual ~ValueBase (); /// This flag is set to be true when the valuetype defined /// in the idl has the truncatable parent. @@ -327,18 +323,18 @@ namespace CORBA : public virtual ValueBase { public: - virtual void _add_ref (void); - virtual void _remove_ref (void); - virtual CORBA::ULong _refcount_value (void); + virtual void _add_ref (); + virtual void _remove_ref (); + virtual CORBA::ULong _refcount_value (); /// The _tao variants are inline for fast access from T_var /// (if valuetype T is compiled with optimization for that.) %! (todo) - void _tao_add_ref (void); - void _tao_remove_ref (void); - CORBA::ULong _tao_refcount_value (void) const; + void _tao_add_ref (); + void _tao_remove_ref (); + CORBA::ULong _tao_refcount_value () const; protected: - DefaultValueRefCountBase (void); + DefaultValueRefCountBase (); DefaultValueRefCountBase (const DefaultValueRefCountBase&); virtual ~DefaultValueRefCountBase (); @@ -347,11 +343,7 @@ namespace CORBA private: // data /// Reference counter. -#if defined (ACE_HAS_CPP11) std::atomic<uint32_t> refcount_; -#else - ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; -#endif /* ACE_HAS_CPP11 */ }; // DefaultValueRefCountBase // which lock has the lowest memory overhead ? diff --git a/TAO/tao/Valuetype/ValueFactory.h b/TAO/tao/Valuetype/ValueFactory.h index 6003f803086..ddfafde6f4c 100644 --- a/TAO/tao/Valuetype/ValueFactory.h +++ b/TAO/tao/Valuetype/ValueFactory.h @@ -26,11 +26,7 @@ #include "ace/Synch_Traits.h" #include "ace/Thread_Mutex.h" #include "ace/Null_Mutex.h" -#if defined (ACE_HAS_CPP11) -# include <atomic> -#else -# include "ace/Atomic_Op.h" -#endif /* ACE_HAS_CPP11 */ +#include <atomic> TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -54,29 +50,25 @@ namespace CORBA class TAO_Valuetype_Export ValueFactoryBase { public: - ValueFactoryBase (void); - virtual ~ValueFactoryBase (void); + ValueFactoryBase (); + virtual ~ValueFactoryBase (); // non-virtual is non-standard - void _add_ref (void); - void _remove_ref (void); + void _add_ref (); + void _remove_ref (); // private: %! /// In a derived class T use return type TAO_OBV_CREATE_RETURN_TYPE (T) /// (see at definition below) - virtual CORBA::ValueBase * create_for_unmarshal (void) = 0; + virtual CORBA::ValueBase * create_for_unmarshal () = 0; /// Not pure virtual because this will be overridden only by valuetypes /// that support an abstract interface. - virtual CORBA::AbstractBase_ptr create_for_unmarshal_abstract (void); + virtual CORBA::AbstractBase_ptr create_for_unmarshal_abstract (); private: /// Reference counter. -#if defined (ACE_HAS_CPP11) std::atomic<uint32_t> refcount_; -#else - ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; -#endif /* ACE_HAS_CPP11 */ }; } // End CORBA namespace diff --git a/TAO/tao/Valuetype/Value_VarOut_T.h b/TAO/tao/Valuetype/Value_VarOut_T.h index 07e3818c5f9..0a5e67ec072 100644 --- a/TAO/tao/Valuetype/Value_VarOut_T.h +++ b/TAO/tao/Valuetype/Value_VarOut_T.h @@ -42,19 +42,19 @@ template <typename T> class TAO_Value_Var_T : private TAO_Base_var { public: - TAO_Value_Var_T (void); + TAO_Value_Var_T (); TAO_Value_Var_T (T *); TAO_Value_Var_T (const TAO_Value_Var_T<T> &); // (TAO extension) TAO_Value_Var_T (const T *); - ~TAO_Value_Var_T (void); + ~TAO_Value_Var_T (); TAO_Value_Var_T &operator= (T *); TAO_Value_Var_T &operator= (const TAO_Value_Var_T<T> &); - T * operator-> (void) const; + T * operator-> () const; operator const T * () const; operator T *& (); @@ -65,13 +65,13 @@ public: typedef T * _retn_type; // in, inout, out, _retn - _in_type in (void) const; - _inout_type inout (void); - _out_type out (void); - _retn_type _retn (void); + _in_type in () const; + _inout_type inout (); + _out_type out (); + _retn_type _retn (); // (TAO extension) - T * ptr (void) const; + T * ptr () const; private: @@ -100,9 +100,9 @@ public: TAO_Value_Out_T &operator= (T *); operator T *& (); - T *& ptr (void); + T *& ptr (); - T * operator-> (void); + T * operator-> (); private: T *& ptr_; diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h index d2c013cf17d..0b8ab48fe36 100644 --- a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h +++ b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h @@ -39,12 +39,12 @@ class TAO_Valuetype_Export TAO_Valuetype_Adapter_Factory_Impl : public TAO_Valuetype_Adapter_Factory { public: - virtual ~TAO_Valuetype_Adapter_Factory_Impl (void); + virtual ~TAO_Valuetype_Adapter_Factory_Impl (); - virtual TAO_Valuetype_Adapter * create (void); + virtual TAO_Valuetype_Adapter * create (); // Used to force the initialization of the ORB code. - static int Initializer (void); + static int Initializer (); }; static const int TAO_Requires_ValueType_Initializer = diff --git a/TAO/tao/Valuetype_Adapter.cpp b/TAO/tao/Valuetype_Adapter.cpp index 9dec3450404..944d6ad3668 100644 --- a/TAO/tao/Valuetype_Adapter.cpp +++ b/TAO/tao/Valuetype_Adapter.cpp @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Valuetype_Adapter::~TAO_Valuetype_Adapter (void) +TAO_Valuetype_Adapter::~TAO_Valuetype_Adapter () { } diff --git a/TAO/tao/Valuetype_Adapter.h b/TAO/tao/Valuetype_Adapter.h index db2f8c8539a..0b2dceb7b4f 100644 --- a/TAO/tao/Valuetype_Adapter.h +++ b/TAO/tao/Valuetype_Adapter.h @@ -51,7 +51,7 @@ class TAO_InputCDR; class TAO_Export TAO_Valuetype_Adapter : public ACE_Service_Object { public: - virtual ~TAO_Valuetype_Adapter (void); + virtual ~TAO_Valuetype_Adapter (); virtual CORBA::Object_ptr abstractbase_to_object ( CORBA::AbstractBase_ptr p) = 0; @@ -63,7 +63,7 @@ public: TAO_InputCDR &, CORBA::AbstractBase_ptr &) = 0; - virtual CORBA::Long type_info_single (void) const = 0; + virtual CORBA::Long type_info_single () const = 0; virtual CORBA::Boolean is_type_info_implied (CORBA::Long) const = 0; virtual CORBA::Boolean is_type_info_single (CORBA::Long) const = 0; diff --git a/TAO/tao/Valuetype_Adapter_Factory.cpp b/TAO/tao/Valuetype_Adapter_Factory.cpp index e6f12a7d34c..eea713b06ad 100644 --- a/TAO/tao/Valuetype_Adapter_Factory.cpp +++ b/TAO/tao/Valuetype_Adapter_Factory.cpp @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Valuetype_Adapter_Factory::~TAO_Valuetype_Adapter_Factory (void) +TAO_Valuetype_Adapter_Factory::~TAO_Valuetype_Adapter_Factory () { } diff --git a/TAO/tao/Valuetype_Adapter_Factory.h b/TAO/tao/Valuetype_Adapter_Factory.h index aa3cd1e5b91..3d90b5b5804 100644 --- a/TAO/tao/Valuetype_Adapter_Factory.h +++ b/TAO/tao/Valuetype_Adapter_Factory.h @@ -39,9 +39,9 @@ class TAO_Export TAO_Valuetype_Adapter_Factory : public ACE_Service_Object { public: - virtual ~TAO_Valuetype_Adapter_Factory (void); + virtual ~TAO_Valuetype_Adapter_Factory (); - virtual TAO_Valuetype_Adapter * create (void) = 0; + virtual TAO_Valuetype_Adapter * create () = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/VarOut_T.h b/TAO/tao/VarOut_T.h index a10d9bbe404..857399b3332 100644 --- a/TAO/tao/VarOut_T.h +++ b/TAO/tao/VarOut_T.h @@ -33,24 +33,24 @@ template<typename T> class TAO_Var_Base_T { public: - TAO_Var_Base_T (void); + TAO_Var_Base_T (); TAO_Var_Base_T (T *); TAO_Var_Base_T (const TAO_Var_Base_T<T> &); - ~TAO_Var_Base_T (void); + ~TAO_Var_Base_T (); - T * operator-> (void); - const T * operator-> (void) const; + T * operator-> (); + const T * operator-> () const; typedef const T & _in_type; typedef T & _inout_type; // Common mapping for fixed and variable size types. - _in_type in (void) const; - _inout_type inout (void); + _in_type in () const; + _inout_type inout (); // TAO extension. - T * ptr (void) const; + T * ptr () const; operator T *& (); protected: @@ -67,7 +67,7 @@ template<typename T> class TAO_Fixed_Var_T : public TAO_Var_Base_T<T> { public: - TAO_Fixed_Var_T (void); + TAO_Fixed_Var_T (); TAO_Fixed_Var_T (T *); TAO_Fixed_Var_T (const TAO_Fixed_Var_T<T> &); @@ -88,8 +88,8 @@ public: typedef T _retn_type; // Mapping for fixed size types. - _out_type out (void); - _retn_type _retn (void); + _out_type out (); + _retn_type _retn (); }; /** @@ -102,7 +102,7 @@ template<typename T> class TAO_Var_Var_T : public TAO_Var_Base_T<T> { public: - TAO_Var_Var_T (void); + TAO_Var_Var_T (); TAO_Var_Var_T (T *); TAO_Var_Var_T (const TAO_Var_Var_T<T> &); @@ -117,8 +117,8 @@ public: typedef T * _retn_type; // Mapping for variable size types. - _out_type out (void); - _retn_type _retn (void); + _out_type out (); + _retn_type _retn (); }; /** @@ -141,8 +141,8 @@ public: TAO_Out_T &operator= (T *); operator T *& (); - T *& ptr (void); - T * operator-> (void); + T *& ptr (); + T * operator-> (); private: T *& ptr_; diff --git a/TAO/tao/Var_Array_Argument_T.h b/TAO/tao/Var_Array_Argument_T.h index 3a633f2d815..f83e7d86abb 100644 --- a/TAO/tao/Var_Array_Argument_T.h +++ b/TAO/tao/Var_Array_Argument_T.h @@ -40,7 +40,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - typename S_forany::_slice_type const * arg (void) const; + typename S_forany::_slice_type const * arg () const; protected: S_forany x_; @@ -59,9 +59,9 @@ namespace TAO { public: In_Var_Array_Clonable_Argument_T (const typename S_forany::_slice_type * x); - virtual ~In_Var_Array_Clonable_Argument_T (void); + virtual ~In_Var_Array_Clonable_Argument_T (); - virtual Argument* clone (void); + virtual Argument* clone (); private: bool is_clone_; @@ -85,7 +85,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - typename S_forany::_slice_type * arg (void); + typename S_forany::_slice_type * arg (); private: S_forany x_; @@ -109,7 +109,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - typename S_forany::_slice_type *& arg (void); + typename S_forany::_slice_type *& arg (); private: typename S_forany::_slice_type *& x_; @@ -127,16 +127,16 @@ namespace TAO class Ret_Var_Array_Argument_T : public RetArgument { public: - Ret_Var_Array_Argument_T (void); + Ret_Var_Array_Argument_T (); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - typename S_forany::_slice_type *& arg (void); + typename S_forany::_slice_type *& arg (); - typename S_forany::_slice_type * excp (void); - typename S_forany::_slice_type * retn (void); + typename S_forany::_slice_type * excp (); + typename S_forany::_slice_type * retn (); private: S_var x_; diff --git a/TAO/tao/Var_Size_Argument_T.h b/TAO/tao/Var_Size_Argument_T.h index d5425df51d5..404a03165a5 100644 --- a/TAO/tao/Var_Size_Argument_T.h +++ b/TAO/tao/Var_Size_Argument_T.h @@ -40,7 +40,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S const & arg (void) const; + S const & arg () const; protected: const S * x_; @@ -62,9 +62,9 @@ namespace TAO { public: In_Var_Size_Clonable_Argument_T (S const & x); - virtual ~In_Var_Size_Clonable_Argument_T (void); + virtual ~In_Var_Size_Clonable_Argument_T (); - virtual Argument* clone (void); + virtual Argument* clone (); private: bool is_clone_; @@ -88,7 +88,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S & arg (void); + S & arg (); private: S * x_; @@ -111,7 +111,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S *& arg (void); + S *& arg (); private: S *& x_; @@ -128,16 +128,16 @@ namespace TAO class Ret_Var_Size_Argument_T : public RetArgument { public: - Ret_Var_Size_Argument_T (void); + Ret_Var_Size_Argument_T (); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S *& arg (void); + S *& arg (); - S * excp (void); - S * retn (void); + S * excp (); + S * retn (); protected: typename S::_var_type x_; diff --git a/TAO/tao/Version.h b/TAO/tao/Version.h index e3aa3a5cd76..10655235dc0 100644 --- a/TAO/tao/Version.h +++ b/TAO/tao/Version.h @@ -4,8 +4,8 @@ #define TAO_MAJOR_VERSION 2 #define TAO_MINOR_VERSION 5 -#define TAO_MICRO_VERSION 11 -#define TAO_BETA_VERSION 11 -#define TAO_VERSION "2.5.11" -#define TAO_VERSION_CODE 132363 +#define TAO_MICRO_VERSION 12 +#define TAO_BETA_VERSION 12 +#define TAO_VERSION "2.5.12" +#define TAO_VERSION_CODE 132364 #define TAO_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c)) diff --git a/TAO/tao/Wait_On_LF_No_Upcall.cpp b/TAO/tao/Wait_On_LF_No_Upcall.cpp index 16405fa3774..c6d79a32ff4 100644 --- a/TAO/tao/Wait_On_LF_No_Upcall.cpp +++ b/TAO/tao/Wait_On_LF_No_Upcall.cpp @@ -11,7 +11,7 @@ namespace TAO { } - Wait_On_LF_No_Upcall::~Wait_On_LF_No_Upcall (void) + Wait_On_LF_No_Upcall::~Wait_On_LF_No_Upcall () { } @@ -25,7 +25,7 @@ namespace TAO } bool - Wait_On_LF_No_Upcall::can_process_upcalls (void) const + Wait_On_LF_No_Upcall::can_process_upcalls () const { if ((this->transport_->opened_as () == TAO::TAO_SERVER_ROLE) && (this->transport_->bidirectional_flag () == -1)) diff --git a/TAO/tao/Wait_On_Leader_Follower.cpp b/TAO/tao/Wait_On_Leader_Follower.cpp index de6873224f4..4491baac65e 100644 --- a/TAO/tao/Wait_On_Leader_Follower.cpp +++ b/TAO/tao/Wait_On_Leader_Follower.cpp @@ -13,20 +13,12 @@ TAO_Wait_On_Leader_Follower::TAO_Wait_On_Leader_Follower { } -TAO_Wait_On_Leader_Follower::~TAO_Wait_On_Leader_Follower (void) +TAO_Wait_On_Leader_Follower::~TAO_Wait_On_Leader_Follower () { } -/* - * Hook to specialize the wait strategy when the concrete strategy is - * a simple "lf" strategy. Add all public/protected/private methods - * within the *COPY* hooks. - */ - -//@@ WAIT_STRATEGY_SPL_COPY_HOOK_START - int -TAO_Wait_On_Leader_Follower::register_handler (void) +TAO_Wait_On_Leader_Follower::register_handler () { if (!this->is_registered_) { @@ -37,7 +29,7 @@ TAO_Wait_On_Leader_Follower::register_handler (void) } bool -TAO_Wait_On_Leader_Follower::non_blocking (void) const +TAO_Wait_On_Leader_Follower::non_blocking () const { return true; } @@ -52,8 +44,6 @@ TAO_Wait_On_Leader_Follower::sending_request (TAO_ORB_Core *orb_core, this->transport_->register_handler (); } - // Send the request. -//@@ LF_WAIT_STRATEGY_SPL_SENDING_REQUEST_HOOK return this->TAO_Wait_Strategy::sending_request (orb_core, msg_semantics); } @@ -67,14 +57,9 @@ TAO_Wait_On_Leader_Follower::wait (ACE_Time_Value *max_wait_time, } bool -TAO_Wait_On_Leader_Follower::can_process_upcalls (void) const +TAO_Wait_On_Leader_Follower::can_process_upcalls () const { return true; } -//@@ WAIT_STRATEGY_SPL_COPY_HOOK_END -/* - * End copy hook. - */ - TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Wait_On_Reactor.cpp b/TAO/tao/Wait_On_Reactor.cpp index 7232bf64838..4e73e0109f9 100644 --- a/TAO/tao/Wait_On_Reactor.cpp +++ b/TAO/tao/Wait_On_Reactor.cpp @@ -13,7 +13,7 @@ TAO_Wait_On_Reactor::TAO_Wait_On_Reactor (TAO_Transport *transport) { } -TAO_Wait_On_Reactor::~TAO_Wait_On_Reactor (void) +TAO_Wait_On_Reactor::~TAO_Wait_On_Reactor () { } @@ -49,7 +49,7 @@ TAO_Wait_On_Reactor::wait (ACE_Time_Value *max_wait_time, // Did we timeout? If so, stop running the loop. if (result == 0 - && max_wait_time != 0 + && max_wait_time != nullptr && *max_wait_time == ACE_Time_Value::zero) { break; @@ -70,7 +70,7 @@ TAO_Wait_On_Reactor::wait (ACE_Time_Value *max_wait_time, } // Return an error if there was a problem receiving the reply. - if (max_wait_time != 0) + if (max_wait_time != nullptr) { if (rd.successful (leader_follower) && *max_wait_time == ACE_Time_Value::zero) { @@ -93,7 +93,7 @@ TAO_Wait_On_Reactor::wait (ACE_Time_Value *max_wait_time, // Register the handler with the Reactor. int -TAO_Wait_On_Reactor::register_handler (void) +TAO_Wait_On_Reactor::register_handler () { if (!this->is_registered_) { @@ -104,13 +104,13 @@ TAO_Wait_On_Reactor::register_handler (void) } bool -TAO_Wait_On_Reactor::non_blocking (void) const +TAO_Wait_On_Reactor::non_blocking () const { return true; } bool -TAO_Wait_On_Reactor::can_process_upcalls (void) const +TAO_Wait_On_Reactor::can_process_upcalls () const { return true; } diff --git a/TAO/tao/Wait_On_Read.cpp b/TAO/tao/Wait_On_Read.cpp index f2cc92134e3..0105e9ed5f4 100644 --- a/TAO/tao/Wait_On_Read.cpp +++ b/TAO/tao/Wait_On_Read.cpp @@ -16,18 +16,10 @@ TAO_Wait_On_Read::TAO_Wait_On_Read (TAO_Transport *transport) } // Destructor. -TAO_Wait_On_Read::~TAO_Wait_On_Read (void) +TAO_Wait_On_Read::~TAO_Wait_On_Read () { } -/* - * Hook to specialize the wait strategy when the concrete strategy is - * a simple "rw" strategy. Add all public/protected/private methods - * within the *COPY* hooks. - */ - -//@@ WAIT_STRATEGY_SPL_COPY_HOOK_START - int TAO_Wait_On_Read::sending_request (TAO_ORB_Core *orb_core, TAO_Message_Semantics msg_semantics) @@ -49,7 +41,6 @@ TAO_Wait_On_Read::sending_request (TAO_ORB_Core *orb_core, } // Send the request. -//@@ LF_WAIT_STRATEGY_SPL_SENDING_REQUEST_HOOK return this->TAO_Wait_Strategy::sending_request (orb_core, msg_semantics); } @@ -68,7 +59,6 @@ TAO_Wait_On_Read::finished_request () } } - //@@ LF_WAIT_STRATEGY_SPL_SENDING_REQUEST_HOOK this->TAO_Wait_Strategy::finished_request (); } @@ -157,26 +147,21 @@ TAO_Wait_On_Read::wait (ACE_Time_Value * max_wait_time, // No-op. int -TAO_Wait_On_Read::register_handler (void) +TAO_Wait_On_Read::register_handler () { return 0; } bool -TAO_Wait_On_Read::non_blocking (void) const +TAO_Wait_On_Read::non_blocking () const { return false; } bool -TAO_Wait_On_Read::can_process_upcalls (void) const +TAO_Wait_On_Read::can_process_upcalls () const { return true; } -//@@ WAIT_STRATEGY_SPL_COPY_HOOK_END -/* - * End copy hook. - */ - TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Wait_Strategy.cpp b/TAO/tao/Wait_Strategy.cpp index efb90ca1103..fc13c417789 100644 --- a/TAO/tao/Wait_Strategy.cpp +++ b/TAO/tao/Wait_Strategy.cpp @@ -1,7 +1,5 @@ #include "tao/Wait_Strategy.h" -//@@ WAIT_STRATEGY_SPL_COPY_HOOK_START - #if !defined (__ACE_INLINE__) # include "tao/Wait_Strategy.inl" #endif /* __ACE_INLINE__ */ @@ -16,7 +14,7 @@ TAO_Wait_Strategy::TAO_Wait_Strategy (TAO_Transport *transport) } // Destructor. -TAO_Wait_Strategy::~TAO_Wait_Strategy (void) +TAO_Wait_Strategy::~TAO_Wait_Strategy () { } @@ -26,25 +24,15 @@ TAO_Wait_Strategy::defer_upcall (ACE_Event_Handler*) return -1; } -/* - * Hook to comment out this method in the lf wait strategy - */ -//@@ LF_WAIT_STRATEGY_SPL_COMMENT_HOOK_START int TAO_Wait_Strategy::sending_request (TAO_ORB_Core *, TAO_Message_Semantics) { return 0; } -//@@ LF_WAIT_STRATEGY_SPL_COMMENT_HOOK_END void TAO_Wait_Strategy::finished_request () { } -/* - * Hook to specialize the Wait Strategy - */ -//@@ TAO_WAIT_STRATEGY_SPL_ADD_HOOK - TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Wait_Strategy.h b/TAO/tao/Wait_Strategy.h index 3c495b7da3d..34fdab5d184 100644 --- a/TAO/tao/Wait_Strategy.h +++ b/TAO/tao/Wait_Strategy.h @@ -46,7 +46,7 @@ public: explicit TAO_Wait_Strategy (TAO_Transport *transport); /// Destructor. - virtual ~TAO_Wait_Strategy (void); + virtual ~TAO_Wait_Strategy (); /** * The user is going to send a request, prepare any internal @@ -66,11 +66,11 @@ public: /// Register the handler needs with the reactor provided that it makes /// sense for the strategy. - virtual int register_handler (void) = 0; + virtual int register_handler () = 0; /// Returns a value to indicate whether the transport needs to set /// the socket on which it is waiting to non-blocking mode or not. - virtual bool non_blocking (void) const = 0; + virtual bool non_blocking () const = 0; /// Flag that indicates whether we can process requests while /// waiting for the reply. @@ -80,7 +80,7 @@ public: * Wait_On_LF_No_Upcall does not allow the client threads to process * requests while waiting for the reply. */ - virtual bool can_process_upcalls (void) const = 0; + virtual bool can_process_upcalls () const = 0; /// Method to support deffering an upcall event till later in /// cases where can_process_upcalls() returns false. @@ -91,7 +91,7 @@ public: virtual int defer_upcall (ACE_Event_Handler*); /// Get method for the flag - bool is_registered (void) const; + bool is_registered () const; /// Set method for the flag void is_registered (bool flag); diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp index e9055d36cda..a2f1be23a7b 100644 --- a/TAO/tao/WrongTransactionC.cpp +++ b/TAO/tao/WrongTransactionC.cpp @@ -48,7 +48,7 @@ namespace TAO // TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 -CORBA::WrongTransaction::WrongTransaction (void) +CORBA::WrongTransaction::WrongTransaction () : CORBA::UserException ( "IDL:omg.org/CORBA/WrongTransaction:1.0", "WrongTransaction" @@ -56,7 +56,7 @@ CORBA::WrongTransaction::WrongTransaction (void) { } -CORBA::WrongTransaction::~WrongTransaction (void) +CORBA::WrongTransaction::~WrongTransaction () { } @@ -94,26 +94,26 @@ CORBA::WrongTransaction::_downcast (CORBA::Exception const *_tao_excp) return dynamic_cast<const WrongTransaction *> (_tao_excp); } -CORBA::Exception *CORBA::WrongTransaction::_alloc (void) +CORBA::Exception *CORBA::WrongTransaction::_alloc () { - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::CORBA::WrongTransaction, 0); + CORBA::Exception *retval = nullptr; + ACE_NEW_RETURN (retval, ::CORBA::WrongTransaction, nullptr); return retval; } CORBA::Exception * -CORBA::WrongTransaction::_tao_duplicate (void) const +CORBA::WrongTransaction::_tao_duplicate () const { - CORBA::Exception *result = 0; + CORBA::Exception *result = nullptr; ACE_NEW_RETURN ( result, ::CORBA::WrongTransaction (*this), - 0 + nullptr ); return result; } -void CORBA::WrongTransaction::_raise (void) const +void CORBA::WrongTransaction::_raise () const { throw *this; } @@ -143,13 +143,13 @@ void CORBA::WrongTransaction::_tao_decode ( } // TAO extension - the virtual _type method. -CORBA::TypeCode_ptr CORBA::WrongTransaction::_tao_type (void) const +CORBA::TypeCode_ptr CORBA::WrongTransaction::_tao_type () const { TAO_AnyTypeCode_Adapter *adapter = ACE_Dynamic_Service<TAO_AnyTypeCode_Adapter>::instance ( "AnyTypeCode_Adapter" ); - if (adapter != 0) + if (adapter != nullptr) return adapter->_tao_type_WrongTransaction (); else { @@ -157,7 +157,7 @@ CORBA::TypeCode_ptr CORBA::WrongTransaction::_tao_type (void) const ACE_TEXT ("(%P|%t) %p\n"), ACE_TEXT ("Unable to find the ") ACE_TEXT ("AnyTypeCode Adapter instance"))); - return 0; + return nullptr; } } diff --git a/TAO/tao/WrongTransactionC.h b/TAO/tao/WrongTransactionC.h index d0094a94f67..11ce0f2f73a 100644 --- a/TAO/tao/WrongTransactionC.h +++ b/TAO/tao/WrongTransactionC.h @@ -63,9 +63,9 @@ namespace CORBA { public: - WrongTransaction (void); + WrongTransaction (); WrongTransaction (const WrongTransaction &); - ~WrongTransaction (void); + ~WrongTransaction (); WrongTransaction &operator= (const WrongTransaction &); @@ -74,11 +74,11 @@ namespace CORBA static WrongTransaction *_downcast (CORBA::Exception *); static const WrongTransaction *_downcast (CORBA::Exception const *); - static CORBA::Exception *_alloc (void); + static CORBA::Exception *_alloc (); - virtual CORBA::Exception *_tao_duplicate (void) const; + virtual CORBA::Exception *_tao_duplicate () const; - virtual void _raise (void) const; + virtual void _raise () const; virtual void _tao_encode ( TAO_OutputCDR & @@ -91,7 +91,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:129 - virtual CORBA::TypeCode_ptr _tao_type (void) const; + virtual CORBA::TypeCode_ptr _tao_type () const; }; #endif /* end #if !defined */ diff --git a/TAO/tao/ZIOP_Adapter.cpp b/TAO/tao/ZIOP_Adapter.cpp index 39a38991533..8f9c4a5cba2 100644 --- a/TAO/tao/ZIOP_Adapter.cpp +++ b/TAO/tao/ZIOP_Adapter.cpp @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_ZIOP_Adapter::~TAO_ZIOP_Adapter (void) +TAO_ZIOP_Adapter::~TAO_ZIOP_Adapter () { } diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp index 8edce81619d..221e680cb50 100644 --- a/TAO/tao/default_client.cpp +++ b/TAO/tao/default_client.cpp @@ -21,7 +21,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Default_Client_Strategy_Factory::TAO_Default_Client_Strategy_Factory (void) +TAO_Default_Client_Strategy_Factory::TAO_Default_Client_Strategy_Factory () : transport_mux_strategy_ (TAO_MUXED_TMS) , wait_strategy_ (TAO_WAIT_ON_LEADER_FOLLOWER) , connect_strategy_ (TAO_LEADER_FOLLOWER_CONNECT) @@ -57,7 +57,7 @@ TAO_Default_Client_Strategy_Factory::TAO_Default_Client_Strategy_Factory (void) #endif } -TAO_Default_Client_Strategy_Factory::~TAO_Default_Client_Strategy_Factory (void) +TAO_Default_Client_Strategy_Factory::~TAO_Default_Client_Strategy_Factory () { } @@ -242,7 +242,7 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[]) { ACE_TCHAR* name = argv[curarg]; - ACE_TCHAR *err = 0; + ACE_TCHAR *err = nullptr; long limit = ACE_OS::strtol (name, &err, 10); if (err && *err != 0) { @@ -264,7 +264,7 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[]) { ACE_TCHAR* name = argv[curarg]; - ACE_TCHAR *err = 0; + ACE_TCHAR *err = nullptr; long limit = ACE_OS::strtol (name, &err, 10); if (err && *err != 0) { @@ -287,7 +287,7 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[]) { ACE_TCHAR* name = argv[curarg]; - ACE_TCHAR *err = 0; + ACE_TCHAR *err = nullptr; long limit = ACE_OS::strtol (name, &err, 10); if (err && *err != 0) { @@ -309,7 +309,7 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[]) { ACE_TCHAR* name = argv[curarg]; - ACE_TCHAR *err = 0; + ACE_TCHAR *err = nullptr; long limit = ACE_OS::strtol (name, &err, 10); if (err && *err != 0) { @@ -331,7 +331,7 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[]) { ACE_TCHAR* name = argv[curarg]; - ACE_TCHAR *err = 0; + ACE_TCHAR *err = nullptr; long limit = ACE_OS::strtol (name, &err, 10); if (err && *err != 0) { @@ -368,7 +368,7 @@ TAO_Transport_Mux_Strategy * TAO_Default_Client_Strategy_Factory::create_transport_mux_strategy ( TAO_Transport *transport) { - TAO_Transport_Mux_Strategy *tms = 0; + TAO_Transport_Mux_Strategy *tms = nullptr; switch (this->transport_mux_strategy_) { @@ -376,14 +376,14 @@ TAO_Default_Client_Strategy_Factory::create_transport_mux_strategy ( { ACE_NEW_RETURN (tms, TAO_Muxed_TMS (transport), - 0); + nullptr); break; } case TAO_EXCLUSIVE_TMS: { ACE_NEW_RETURN (tms, TAO_Exclusive_TMS (transport), - 0); + nullptr); break; } } @@ -392,9 +392,9 @@ TAO_Default_Client_Strategy_Factory::create_transport_mux_strategy ( } ACE_Lock * -TAO_Default_Client_Strategy_Factory::create_transport_mux_strategy_lock (void) +TAO_Default_Client_Strategy_Factory::create_transport_mux_strategy_lock () { - ACE_Lock *the_lock = 0; + ACE_Lock *the_lock = nullptr; switch (this->muxed_strategy_lock_type_) { @@ -402,14 +402,14 @@ TAO_Default_Client_Strategy_Factory::create_transport_mux_strategy_lock (void) { ACE_NEW_RETURN (the_lock, ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX> (), - 0); + nullptr); break; } case TAO_THREAD_LOCK: { ACE_NEW_RETURN (the_lock, ACE_Lock_Adapter<TAO_SYNCH_RECURSIVE_MUTEX> (), - 0); + nullptr); break; } } @@ -418,7 +418,7 @@ TAO_Default_Client_Strategy_Factory::create_transport_mux_strategy_lock (void) } int -TAO_Default_Client_Strategy_Factory::reply_dispatcher_table_size (void) const +TAO_Default_Client_Strategy_Factory::reply_dispatcher_table_size () const { return this->rd_table_size_; } @@ -427,51 +427,45 @@ TAO_Wait_Strategy * TAO_Default_Client_Strategy_Factory::create_wait_strategy ( TAO_Transport *transport) { - TAO_Wait_Strategy *ws = 0; + TAO_Wait_Strategy *ws = nullptr; -/* - * Hook to customize the wait strategy object when the concrete - * wait strategy object is known a priori. - */ -//@@ WAIT_STRATEGY_SPL_COMMENT_HOOK_START switch (this->wait_strategy_) { case TAO_WAIT_ON_LEADER_FOLLOWER : { ACE_NEW_RETURN (ws, TAO_Wait_On_Leader_Follower (transport), - 0); + nullptr); break; } case TAO_WAIT_ON_REACTOR: { ACE_NEW_RETURN (ws, TAO_Wait_On_Reactor (transport), - 0); + nullptr); break; } case TAO_WAIT_ON_READ: { ACE_NEW_RETURN (ws, TAO_Wait_On_Read (transport), - 0); + nullptr); break; } case TAO_WAIT_ON_LF_NO_UPCALL: { ACE_NEW_RETURN (ws, TAO::Wait_On_LF_No_Upcall (transport), - 0); + nullptr); break; } } -//@@ WAIT_STRATEGY_SPL_COMMENT_HOOK_END return ws; } TAO_Client_Strategy_Factory::Connect_Strategy -TAO_Default_Client_Strategy_Factory::connect_strategy (void) const +TAO_Default_Client_Strategy_Factory::connect_strategy () const { return this->connect_strategy_; } @@ -480,7 +474,7 @@ TAO_Connect_Strategy * TAO_Default_Client_Strategy_Factory::create_connect_strategy ( TAO_ORB_Core *orb_core) { - TAO_Connect_Strategy *cs = 0; + TAO_Connect_Strategy *cs = nullptr; switch (this->connect_strategy_) { @@ -488,21 +482,21 @@ TAO_Default_Client_Strategy_Factory::create_connect_strategy ( { ACE_NEW_RETURN (cs, TAO_Blocked_Connect_Strategy (orb_core), - 0); + nullptr); break; } case TAO_REACTIVE_CONNECT: { ACE_NEW_RETURN (cs, TAO_Reactive_Connect_Strategy (orb_core), - 0); + nullptr); break; } case TAO_LEADER_FOLLOWER_CONNECT : { ACE_NEW_RETURN (cs, TAO_LF_Connect_Strategy (orb_core, this->wait_strategy_ == TAO_WAIT_ON_LF_NO_UPCALL), - 0); + nullptr); break; } } @@ -511,13 +505,13 @@ TAO_Default_Client_Strategy_Factory::create_connect_strategy ( } Messaging::SyncScope -TAO_Default_Client_Strategy_Factory::sync_scope (void) const +TAO_Default_Client_Strategy_Factory::sync_scope () const { return this->sync_scope_; } int -TAO_Default_Client_Strategy_Factory::allow_callback (void) +TAO_Default_Client_Strategy_Factory::allow_callback () { return (this->wait_strategy_ != TAO_WAIT_ON_READ); } @@ -534,13 +528,13 @@ TAO_Default_Client_Strategy_Factory::report_option_value_error ( } bool -TAO_Default_Client_Strategy_Factory::use_cleanup_options (void) const +TAO_Default_Client_Strategy_Factory::use_cleanup_options () const { return this->use_cleanup_options_; } const TAO::Invocation_Retry_Params & -TAO_Default_Client_Strategy_Factory::invocation_retry_params (void) const +TAO_Default_Client_Strategy_Factory::invocation_retry_params () const { return this->invocation_retry_params_; } diff --git a/TAO/tao/default_environment.h b/TAO/tao/default_environment.h index 956f8559556..cedbe7c22c7 100644 --- a/TAO/tao/default_environment.h +++ b/TAO/tao/default_environment.h @@ -33,7 +33,7 @@ namespace CORBA /** * @note We tried with CORBA::default_environment() and others. */ -TAO_Export CORBA::Environment& TAO_default_environment (void); +TAO_Export CORBA::Environment& TAO_default_environment (); TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp index 8ea0122bbb4..cee00e985c0 100644 --- a/TAO/tao/default_resource.cpp +++ b/TAO/tao/default_resource.cpp @@ -34,20 +34,20 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Codeset_Parameters::TAO_Codeset_Parameters (void) +TAO_Codeset_Parameters::TAO_Codeset_Parameters () : translators_ () - , native_ (0) + , native_ (nullptr) { } -TAO_Codeset_Parameters::~TAO_Codeset_Parameters (void) +TAO_Codeset_Parameters::~TAO_Codeset_Parameters () { for (TAO_Codeset_Parameters::iterator i = this->translators (); !i.done (); i.advance ()) { - ACE_TCHAR** element = 0; + ACE_TCHAR** element = nullptr; if (i.next (element)) ACE_OS::free (*element); } @@ -56,7 +56,7 @@ TAO_Codeset_Parameters::~TAO_Codeset_Parameters (void) } const ACE_TCHAR* -TAO_Codeset_Parameters::native (void) +TAO_Codeset_Parameters::native () { return (this->native_); } @@ -64,13 +64,13 @@ TAO_Codeset_Parameters::native (void) void TAO_Codeset_Parameters::apply_to (TAO_Codeset_Descriptor_Base *csd) { - if (csd == 0) + if (csd == nullptr) return; - if (this->native () != 0) + if (this->native () != nullptr) csd->ncs (this->native ()); - ACE_TCHAR** element = 0; + ACE_TCHAR** element = nullptr; for (TAO_Codeset_Parameters::iterator i = this->translators (); !i.done (); i.advance ()) @@ -94,15 +94,15 @@ TAO_Codeset_Parameters::add_translator (const ACE_TCHAR*name) } TAO_Codeset_Parameters::iterator -TAO_Codeset_Parameters::translators (void) +TAO_Codeset_Parameters::translators () { return this->translators_.begin (); } -TAO_Default_Resource_Factory::TAO_Default_Resource_Factory (void) +TAO_Default_Resource_Factory::TAO_Default_Resource_Factory () : use_locked_data_blocks_ (1) , parser_names_count_ (0) - , parser_names_ (0) + , parser_names_ (nullptr) , protocol_factories_ () , connection_purging_type_ (TAO_CONNECTION_PURGING_STRATEGY) , cache_maximum_ (TAO_CONNECTION_CACHE_MAXIMUM) @@ -143,7 +143,7 @@ TAO_Default_Resource_Factory::TAO_Default_Resource_Factory (void) } -TAO_Default_Resource_Factory::~TAO_Default_Resource_Factory (void) +TAO_Default_Resource_Factory::~TAO_Default_Resource_Factory () { const TAO_ProtocolFactorySetItor end = this->protocol_factories_.end (); @@ -205,7 +205,7 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) for (int i = 0; i < this->parser_names_count_; ++i) - this->parser_names_[i] = 0; + this->parser_names_[i] = nullptr; this->index_ = 0; } @@ -237,7 +237,7 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) ++curarg; if (curarg < argc) { - TAO_Protocol_Item *item = 0; + TAO_Protocol_Item *item = nullptr; ACE_NEW_RETURN (item, TAO_Protocol_Item (ACE_TEXT_ALWAYS_CHAR(argv[curarg])), -1); @@ -390,10 +390,6 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) ACE_TEXT("-ORBFlushingStrategy")) == 0) { ++curarg; - /* - * Hook to specialize TAO's Flushing strategy implementations - */ -//@@ FLUSHING_STRATEGY_SPL_COMMENT_HOOK_START if (curarg < argc) { ACE_TCHAR* name = argv[curarg]; @@ -410,7 +406,6 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) else this->report_option_value_error (ACE_TEXT("-ORBFlushingStrategy"), name); } -//@@ FLUSHING_STRATEGY_SPL_COMMENT_HOOK_END } else if (ACE_OS::strcasecmp (argv[curarg], ACE_TEXT ("-ORBMuxedConnectionMax")) == 0) @@ -429,7 +424,7 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) ++curarg; if (curarg < argc) { - int tmp = ACE_OS::atoi (argv[curarg]); + int const tmp = ACE_OS::atoi (argv[curarg]); if (tmp == 0) this->drop_replies_ = false; @@ -598,7 +593,7 @@ TAO_Default_Resource_Factory::add_to_ior_parser_names (const char *curarg) // This is virtual and protected... int -TAO_Default_Resource_Factory::load_default_protocols (void) +TAO_Default_Resource_Factory::load_default_protocols () { #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) // If the user did not list any protocols in her svc.conf file @@ -637,7 +632,7 @@ TAO_Default_Resource_Factory::load_default_protocols (void) } int -TAO_Default_Resource_Factory::init_protocol_factories (void) +TAO_Default_Resource_Factory::init_protocol_factories () { const TAO_ProtocolFactorySetItor end = protocol_factories_.end (); TAO_ProtocolFactorySetItor factory = protocol_factories_.begin (); @@ -652,7 +647,7 @@ TAO_Default_Resource_Factory::init_protocol_factories (void) const ACE_CString &name = (*factory)->protocol_name (); (*factory)->factory ( ACE_Dynamic_Service<TAO_Protocol_Factory>::instance (name.c_str ())); - if ((*factory)->factory () == 0) + if ((*factory)->factory () == nullptr) { TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Unable to load ") @@ -674,50 +669,50 @@ TAO_Default_Resource_Factory::init_protocol_factories (void) } int -TAO_Default_Resource_Factory::use_locked_data_blocks (void) const +TAO_Default_Resource_Factory::use_locked_data_blocks () const { return this->use_locked_data_blocks_; } TAO_ProtocolFactorySet * -TAO_Default_Resource_Factory::get_protocol_factories (void) +TAO_Default_Resource_Factory::get_protocol_factories () { return &protocol_factories_; } TAO_Acceptor_Registry * -TAO_Default_Resource_Factory::get_acceptor_registry (void) +TAO_Default_Resource_Factory::get_acceptor_registry () { - TAO_Acceptor_Registry *ar = 0; + TAO_Acceptor_Registry *ar = nullptr; ACE_NEW_RETURN(ar, TAO_Acceptor_Registry, - 0); + nullptr); return ar; } TAO_Connector_Registry * -TAO_Default_Resource_Factory::get_connector_registry (void) +TAO_Default_Resource_Factory::get_connector_registry () { - TAO_Connector_Registry *cr = 0; + TAO_Connector_Registry *cr = nullptr; ACE_NEW_RETURN(cr, TAO_Connector_Registry, - 0); + nullptr); return cr; } #if (TAO_HAS_TIME_POLICY == 1) TAO_Time_Policy_Manager* -TAO_Default_Resource_Factory::time_policy_manager (void) const +TAO_Default_Resource_Factory::time_policy_manager () const { // get time policy manager service TAO_Time_Policy_Manager * tpm = ACE_Dynamic_Service<TAO_Time_Policy_Manager>::instance (ACE_TEXT ("Time_Policy_Manager")); - if (tpm == 0) + if (tpm == nullptr) { TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - TAO_Default_Resource_Factory::time_policy_manager: ") @@ -729,7 +724,7 @@ TAO_Default_Resource_Factory::time_policy_manager (void) const #endif /* TAO_HAS_TIME_POLICY */ ACE_Timer_Queue * -TAO_Default_Resource_Factory::create_timer_queue (void) const +TAO_Default_Resource_Factory::create_timer_queue () const { #if (TAO_HAS_TIME_POLICY == 1) TAO_Time_Policy_Manager * tpm = this->time_policy_manager (); @@ -738,7 +733,7 @@ TAO_Default_Resource_Factory::create_timer_queue (void) const return tpm->create_timer_queue (); } #endif /* TAO_HAS_TIME_POLICY */ - return 0; + return nullptr; } void @@ -754,37 +749,32 @@ TAO_Default_Resource_Factory::destroy_timer_queue (ACE_Timer_Queue *tmq) const } ACE_Reactor_Impl* -TAO_Default_Resource_Factory::allocate_reactor_impl (void) const +TAO_Default_Resource_Factory::allocate_reactor_impl () const { - ACE_Reactor_Impl *impl = 0; - /* - * Hook to specialize TAO's reactor implementation. - */ + ACE_Reactor_Impl *impl = nullptr; // get a timer queue (or not) from a possibly configured // time policy TAO_RSF_Timer_Queue_Ptr tmq (*this, this->create_timer_queue ()); -//@@ TAO_REACTOR_SPL_COMMENT_HOOK_START ACE_NEW_RETURN (impl, ACE_TP_Reactor (ACE::max_handles (), 1, - (ACE_Sig_Handler*)0, + (ACE_Sig_Handler*)nullptr, tmq.get (), this->reactor_mask_signals_, ACE_Select_Reactor_Token::LIFO), - 0); -//@@ TAO_REACTOR_SPL_COMMENT_HOOK_END + nullptr); // safe to release timer queue tmq.release (); return impl; } ACE_Reactor * -TAO_Default_Resource_Factory::get_reactor (void) +TAO_Default_Resource_Factory::get_reactor () { - ACE_Reactor *reactor = 0; + ACE_Reactor *reactor = nullptr; ACE_NEW_RETURN (reactor, ACE_Reactor (this->allocate_reactor_impl (), 1), - 0); + nullptr); if (reactor->initialized () == 0) { @@ -792,7 +782,7 @@ TAO_Default_Resource_Factory::get_reactor (void) ACE_Timer_Queue *tmq = reactor->timer_queue (); // clean up reactor delete reactor; - reactor = 0; + reactor = nullptr; // clean up timer queue in case it was created by time policy this->destroy_timer_queue (tmq); } @@ -831,102 +821,102 @@ TAO_Default_Resource_Factory::use_local_memory_pool (bool flag) } ACE_Allocator * -TAO_Default_Resource_Factory::input_cdr_dblock_allocator (void) +TAO_Default_Resource_Factory::input_cdr_dblock_allocator () { - ACE_Allocator *allocator = 0; + ACE_Allocator *allocator = nullptr; if (use_local_memory_pool_) { ACE_NEW_RETURN (allocator, LOCKED_ALLOCATOR_POOL, - 0); + nullptr); } else { ACE_NEW_RETURN (allocator, LOCKED_ALLOCATOR_NO_POOL, - 0); + nullptr); } return allocator; } ACE_Allocator * -TAO_Default_Resource_Factory::input_cdr_buffer_allocator (void) +TAO_Default_Resource_Factory::input_cdr_buffer_allocator () { - ACE_Allocator *allocator = 0; + ACE_Allocator *allocator = nullptr; if (use_local_memory_pool_) { ACE_NEW_RETURN (allocator, LOCKED_ALLOCATOR_POOL, - 0); + nullptr); } else { ACE_NEW_RETURN (allocator, LOCKED_ALLOCATOR_NO_POOL, - 0); + nullptr); } return allocator; } ACE_Allocator * -TAO_Default_Resource_Factory::input_cdr_msgblock_allocator (void) +TAO_Default_Resource_Factory::input_cdr_msgblock_allocator () { - ACE_Allocator *allocator = 0; + ACE_Allocator *allocator = nullptr; if (use_local_memory_pool_) { ACE_NEW_RETURN (allocator, LOCKED_ALLOCATOR_POOL, - 0); + nullptr); } else { ACE_NEW_RETURN (allocator, LOCKED_ALLOCATOR_NO_POOL, - 0); + nullptr); } return allocator; } int -TAO_Default_Resource_Factory::input_cdr_allocator_type_locked (void) +TAO_Default_Resource_Factory::input_cdr_allocator_type_locked () { return 1; } ACE_Allocator* -TAO_Default_Resource_Factory::output_cdr_dblock_allocator (void) +TAO_Default_Resource_Factory::output_cdr_dblock_allocator () { - ACE_Allocator *allocator = 0; + ACE_Allocator *allocator = nullptr; if (use_local_memory_pool_) { ACE_NEW_RETURN (allocator, LOCKED_ALLOCATOR_POOL, - 0); + nullptr); } else { ACE_NEW_RETURN (allocator, LOCKED_ALLOCATOR_NO_POOL, - 0); + nullptr); } return allocator; } ACE_Allocator * -TAO_Default_Resource_Factory::output_cdr_buffer_allocator (void) +TAO_Default_Resource_Factory::output_cdr_buffer_allocator () { - ACE_Allocator *allocator = 0; + ACE_Allocator *allocator = nullptr; switch (this->output_cdr_allocator_type_) { case LOCAL_MEMORY_POOL: ACE_NEW_RETURN (allocator, LOCKED_ALLOCATOR_POOL, - 0); + nullptr); break; @@ -934,7 +924,7 @@ TAO_Default_Resource_Factory::output_cdr_buffer_allocator (void) case MMAP_ALLOCATOR: ACE_NEW_RETURN (allocator, TAO_MMAP_Allocator, - 0); + nullptr); break; #endif /* TAO_HAS_SENDFILE==1 */ @@ -943,7 +933,7 @@ TAO_Default_Resource_Factory::output_cdr_buffer_allocator (void) default: ACE_NEW_RETURN (allocator, LOCKED_ALLOCATOR_NO_POOL, - 0); + nullptr); break; } @@ -952,103 +942,103 @@ TAO_Default_Resource_Factory::output_cdr_buffer_allocator (void) } ACE_Allocator* -TAO_Default_Resource_Factory::output_cdr_msgblock_allocator (void) +TAO_Default_Resource_Factory::output_cdr_msgblock_allocator () { - ACE_Allocator *allocator = 0; + ACE_Allocator *allocator = nullptr; if (use_local_memory_pool_) { ACE_NEW_RETURN (allocator, LOCKED_ALLOCATOR_POOL, - 0); + nullptr); } else { ACE_NEW_RETURN (allocator, LOCKED_ALLOCATOR_NO_POOL, - 0); + nullptr); } return allocator; } ACE_Allocator* -TAO_Default_Resource_Factory::amh_response_handler_allocator (void) +TAO_Default_Resource_Factory::amh_response_handler_allocator () { - ACE_Allocator *allocator = 0; + ACE_Allocator *allocator = nullptr; if (use_local_memory_pool_) { ACE_NEW_RETURN (allocator, LOCKED_ALLOCATOR_POOL, - 0); + nullptr); } else { ACE_NEW_RETURN (allocator, LOCKED_ALLOCATOR_NO_POOL, - 0); + nullptr); } return allocator; } ACE_Allocator* -TAO_Default_Resource_Factory::ami_response_handler_allocator (void) +TAO_Default_Resource_Factory::ami_response_handler_allocator () { - ACE_Allocator *allocator = 0; + ACE_Allocator *allocator = nullptr; if (use_local_memory_pool_) { ACE_NEW_RETURN (allocator, LOCKED_ALLOCATOR_POOL, - 0); + nullptr); } else { ACE_NEW_RETURN (allocator, LOCKED_ALLOCATOR_NO_POOL, - 0); + nullptr); } return allocator; } int -TAO_Default_Resource_Factory::cache_maximum (void) const +TAO_Default_Resource_Factory::cache_maximum () const { return this->cache_maximum_; } int -TAO_Default_Resource_Factory::purge_percentage (void) const +TAO_Default_Resource_Factory::purge_percentage () const { return this->purge_percentage_; } int -TAO_Default_Resource_Factory::max_muxed_connections (void) const +TAO_Default_Resource_Factory::max_muxed_connections () const { return this->max_muxed_connections_; } ACE_Lock * -TAO_Default_Resource_Factory::create_cached_connection_lock (void) +TAO_Default_Resource_Factory::create_cached_connection_lock () { - ACE_Lock *the_lock = 0; + ACE_Lock *the_lock = nullptr; if (this->cached_connection_lock_type_ == TAO_NULL_LOCK) ACE_NEW_RETURN (the_lock, ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX>, - 0); + nullptr); else ACE_NEW_RETURN (the_lock, ACE_Lock_Adapter<TAO_SYNCH_MUTEX>, - 0); + nullptr); return the_lock; } int -TAO_Default_Resource_Factory::locked_transport_cache (void) +TAO_Default_Resource_Factory::locked_transport_cache () { if (this->cached_connection_lock_type_ == TAO_NULL_LOCK) return 0; @@ -1057,35 +1047,35 @@ TAO_Default_Resource_Factory::locked_transport_cache (void) } TAO_Flushing_Strategy * -TAO_Default_Resource_Factory::create_flushing_strategy (void) +TAO_Default_Resource_Factory::create_flushing_strategy () { - TAO_Flushing_Strategy *strategy = 0; + TAO_Flushing_Strategy *strategy = nullptr; if (this->flushing_strategy_type_ == TAO_LEADER_FOLLOWER_FLUSHING) ACE_NEW_RETURN (strategy, TAO_Leader_Follower_Flushing_Strategy, - 0); + nullptr); else if (this->flushing_strategy_type_ == TAO_REACTIVE_FLUSHING) ACE_NEW_RETURN (strategy, TAO_Reactive_Flushing_Strategy, - 0); + nullptr); else ACE_NEW_RETURN (strategy, TAO_Block_Flushing_Strategy, - 0); + nullptr); return strategy; } TAO_Connection_Purging_Strategy * -TAO_Default_Resource_Factory::create_purging_strategy (void) +TAO_Default_Resource_Factory::create_purging_strategy () { - TAO_Connection_Purging_Strategy *strategy = 0; + TAO_Connection_Purging_Strategy *strategy = nullptr; if (this->connection_purging_type_ == TAO_Resource_Factory::LRU) { ACE_NEW_RETURN (strategy, TAO_LRU_Connection_Purging_Strategy ( this->cache_maximum ()), - 0); + nullptr); } else { @@ -1099,13 +1089,13 @@ TAO_Default_Resource_Factory::create_purging_strategy (void) } TAO_LF_Strategy * -TAO_Default_Resource_Factory::create_lf_strategy (void) +TAO_Default_Resource_Factory::create_lf_strategy () { - TAO_LF_Strategy *strategy = 0; + TAO_LF_Strategy *strategy = nullptr; ACE_NEW_RETURN (strategy, TAO_LF_Strategy_Complete, - 0); + nullptr); return strategy; } @@ -1115,7 +1105,7 @@ TAO_Default_Resource_Factory::create_fragmentation_strategy ( TAO_Transport * transport, CORBA::ULong max_message_size) const { - TAO_GIOP_Fragmentation_Strategy* strategy = 0; + TAO_GIOP_Fragmentation_Strategy* strategy = nullptr; // Minimum GIOP message size is 24 (a multiple of 8): // 12 GIOP Message Header @@ -1164,7 +1154,7 @@ TAO_Default_Resource_Factory::report_option_value_error ( } void -TAO_Default_Resource_Factory::disable_factory (void) +TAO_Default_Resource_Factory::disable_factory () { this->factory_disabled_ = 1; if (this->options_processed_) @@ -1176,29 +1166,29 @@ TAO_Default_Resource_Factory::disable_factory (void) } TAO_Codeset_Manager * -TAO_Default_Resource_Factory::codeset_manager(void) +TAO_Default_Resource_Factory::codeset_manager() { TAO_Codeset_Manager_Factory_Base *factory = ACE_Dynamic_Service<TAO_Codeset_Manager_Factory_Base>::instance ("TAO_Codeset"); - if (factory == 0) + if (factory == nullptr) { if (TAO_debug_level >= 2) TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Default_Resource_Factory") ACE_TEXT (" - unable to find codeset manager factory.\n"))); - return 0; + return nullptr; } TAO_Codeset_Manager* mgr = factory->create (); - if (mgr == 0) + if (mgr == nullptr) { if (TAO_debug_level >= 2) TAOLIB_DEBUG ((LM_INFO, ACE_TEXT ("TAO (%P|%t) - Default_Resource_Factory") ACE_TEXT (" - unable to create codeset manager.\n"))); - return 0; + return nullptr; } @@ -1217,13 +1207,13 @@ TAO_Default_Resource_Factory::codeset_manager(void) } TAO_Resource_Factory::Resource_Usage -TAO_Default_Resource_Factory::resource_usage_strategy (void) const +TAO_Default_Resource_Factory::resource_usage_strategy () const { return this->resource_usage_strategy_; } bool -TAO_Default_Resource_Factory::drop_replies_during_shutdown (void) const +TAO_Default_Resource_Factory::drop_replies_during_shutdown () const { return this->drop_replies_; } diff --git a/TAO/tao/default_server.cpp b/TAO/tao/default_server.cpp index f37c5d498c3..6e59dd8bb09 100644 --- a/TAO/tao/default_server.cpp +++ b/TAO/tao/default_server.cpp @@ -5,20 +5,20 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Default_Server_Strategy_Factory::TAO_Default_Server_Strategy_Factory (void) +TAO_Default_Server_Strategy_Factory::TAO_Default_Server_Strategy_Factory () : activate_server_connections_ (0), thread_flags_ (THR_BOUND | THR_DETACHED), thread_per_connection_use_timeout_ (-1) { } -TAO_Default_Server_Strategy_Factory::~TAO_Default_Server_Strategy_Factory (void) +TAO_Default_Server_Strategy_Factory::~TAO_Default_Server_Strategy_Factory () { // Perform appropriate cleanup. } int -TAO_Default_Server_Strategy_Factory::activate_server_connections (void) +TAO_Default_Server_Strategy_Factory::activate_server_connections () { return this->activate_server_connections_; } @@ -31,13 +31,13 @@ TAO_Default_Server_Strategy_Factory::thread_per_connection_timeout (ACE_Time_Val } int -TAO_Default_Server_Strategy_Factory::server_connection_thread_flags (void) +TAO_Default_Server_Strategy_Factory::server_connection_thread_flags () { return this->thread_flags_; } int -TAO_Default_Server_Strategy_Factory::server_connection_thread_count (void) +TAO_Default_Server_Strategy_Factory::server_connection_thread_count () { return 1; } @@ -52,13 +52,13 @@ TAO_Default_Server_Strategy_Factory::server_connection_thread_count (void) void TAO_Default_Server_Strategy_Factory::tokenize (ACE_TCHAR* flag_string) { - ACE_TCHAR* lasts = 0; + ACE_TCHAR* lasts = nullptr; for (ACE_TCHAR* flag = ACE_OS::strtok_r (flag_string, ACE_TEXT("|"), &lasts); - flag != 0; - flag = ACE_OS::strtok_r (0, + flag != nullptr; + flag = ACE_OS::strtok_r (nullptr, ACE_TEXT("|"), &lasts)) { @@ -129,7 +129,7 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[]) else { this->thread_per_connection_use_timeout_ = 1; - int milliseconds = ACE_OS::atoi (name); + int const milliseconds = ACE_OS::atoi (name); this->thread_per_connection_timeout_.set (0, 1000 * milliseconds); } @@ -145,7 +145,7 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[]) if (curarg < argc) this->active_object_map_creation_parameters_.active_object_map_size_ = ACE_OS::strtoul (argv[curarg], - 0, + nullptr, 10); } else if (ACE_OS::strcasecmp (argv[curarg], @@ -155,7 +155,7 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[]) if (curarg < argc) this->active_object_map_creation_parameters_.poa_map_size_ = ACE_OS::strtoul (argv[curarg], - 0, + nullptr, 10); } else if (ACE_OS::strcasecmp (argv[curarg], diff --git a/TAO/tao/operation_details.cpp b/TAO/tao/operation_details.cpp index 2c0bd86b0c1..873d7fff501 100644 --- a/TAO/tao/operation_details.cpp +++ b/TAO/tao/operation_details.cpp @@ -28,7 +28,7 @@ TAO_Operation_Details::corba_exception (const char *id) const // Create an exception object CORBA::Exception *exception = this->ex_data_[i].alloc (); - if (exception == 0) + if (exception == nullptr) { throw ::CORBA::NO_MEMORY (0, CORBA::COMPLETED_YES); } diff --git a/TAO/tao/operation_details.h b/TAO/tao/operation_details.h index bdace9457dd..9d85feb2355 100644 --- a/TAO/tao/operation_details.h +++ b/TAO/tao/operation_details.h @@ -63,7 +63,6 @@ class TAO_Reply_Dispatcher; class TAO_Export TAO_Operation_Details { public: - /// Declare FW_Server_Request_Wrapper a friend /// This friendship makes the FW_Server_Request_Wrapper be able to /// clone the TAO_Operation_Details data member in TAO_ServerRequest. @@ -79,46 +78,46 @@ public: const CORBA::ULong ex_count = 0); /// Operation name - const char* opname (void) const; + const char* opname () const; /// Length of the operation name - CORBA::ULong opname_len (void) const; + CORBA::ULong opname_len () const; /// Return the flag that indicates whether the operation has any /// arguments - CORBA::Boolean argument_flag (void) const; - CORBA::Boolean in_argument_flag (void) const; + CORBA::Boolean argument_flag () const; + CORBA::Boolean in_argument_flag () const; /// Set the response flags void response_flags (CORBA::Octet flags); /// Get the response flags - CORBA::Octet response_flags (void) const; + CORBA::Octet response_flags () const; /// Accessors for the service context list - IOP::ServiceContextList &request_service_info (void); - const IOP::ServiceContextList &request_service_info (void) const; - IOP::ServiceContextList &reply_service_info (void); - const IOP::ServiceContextList &reply_service_info (void) const; + IOP::ServiceContextList &request_service_info (); + const IOP::ServiceContextList &request_service_info () const; + IOP::ServiceContextList &reply_service_info (); + const IOP::ServiceContextList &reply_service_info () const; /// Access the TAO_Service_Context - TAO_Service_Context &request_service_context (void); - const TAO_Service_Context &request_service_context (void) const; - TAO_Service_Context &reply_service_context (void); - const TAO_Service_Context &reply_service_context (void) const; + TAO_Service_Context &request_service_context (); + const TAO_Service_Context &request_service_context () const; + TAO_Service_Context &reply_service_context (); + const TAO_Service_Context &reply_service_context () const; /// Reset the contents of the service context lists that we hold. - void reset_request_service_info (void); - void reset_reply_service_info (void); + void reset_request_service_info (); + void reset_reply_service_info (); /// Cache the request id. void request_id (CORBA::ULong id); /// Return the request ID associated with the operation - CORBA::ULong request_id (void) const; + CORBA::ULong request_id () const; /// Accessor method for the addressing mode - TAO_Target_Specification::TAO_Target_Address addressing_mode (void) const; + TAO_Target_Specification::TAO_Target_Address addressing_mode () const; /// Set method for the addressing mode void addressing_mode (CORBA::Short addr); @@ -149,34 +148,33 @@ public: bool demarshal_args (TAO_InputCDR &cdr); /// Accessors for the argument list - TAO::Argument ** args (void) const; - CORBA::ULong args_num (void) const ; + TAO::Argument ** args () const; + CORBA::ULong args_num () const ; /// Exception count - CORBA::ULong ex_count (void) const; + CORBA::ULong ex_count () const; - TAO::Exception_Data const * ex_data (void) const; + TAO::Exception_Data const * ex_data () const; - CORBA::Boolean use_stub_args (void) const; + CORBA::Boolean use_stub_args () const; void use_stub_args (CORBA::Boolean use_stub_arguments); #if TAO_HAS_INTERCEPTORS == 1 void ft_expiration_time (TimeBase::TimeT time); - TimeBase::TimeT ft_expiration_time (void) const; + TimeBase::TimeT ft_expiration_time () const; void ft_retention_id (CORBA::Long request_id); - CORBA::Long ft_retention_id (void) const; + CORBA::Long ft_retention_id () const; #endif /*TAO_HAS_INTERCEPTORS == 1*/ /// Accessor for cac_ pointer. - TAO::Collocated_Arguments_Converter *cac (void) const; + TAO::Collocated_Arguments_Converter *cac () const; void cac (TAO::Collocated_Arguments_Converter *cac); - TAO_Reply_Dispatcher *reply_dispatcher (void) const; + TAO_Reply_Dispatcher *reply_dispatcher () const; void reply_dispatcher (TAO_Reply_Dispatcher *rd); private: - /// Name of the operation being invoked. const char *opname_; @@ -235,7 +233,6 @@ private: /// The optional reply dispatcher TAO_Reply_Dispatcher *reply_dispatcher_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h index 86530c3e4e7..de5905aea50 100644 --- a/TAO/tao/orbconf.h +++ b/TAO/tao/orbconf.h @@ -853,10 +853,6 @@ enum TAO_Policy_Scope # endif #endif -#if !defined (TAO_HAS_SEQUENCE_ITERATORS) -# define TAO_HAS_SEQUENCE_ITERATORS 0 -#endif - #if !defined (TAO_DEFAULT_COLLOCATION_STRATEGY) # define TAO_DEFAULT_COLLOCATION_STRATEGY TAO_COLLOCATION_THRU_POA #endif diff --git a/TAO/tao/params.cpp b/TAO/tao/params.cpp index 286ea3f81c7..885cb7eaab6 100644 --- a/TAO/tao/params.cpp +++ b/TAO/tao/params.cpp @@ -16,7 +16,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_ORB_Parameters::TAO_ORB_Parameters (void) +TAO_ORB_Parameters::TAO_ORB_Parameters () : endpoints_map_ (10) , mcast_discovery_endpoint_ () , default_init_ref_ (TAO_DEFAULT_INIT_REFERENCE_INITIALIZER) @@ -291,7 +291,7 @@ TAO_ORB_Parameters::preferred_interfaces (const char *s) } const char * -TAO_ORB_Parameters::preferred_interfaces (void) const +TAO_ORB_Parameters::preferred_interfaces () const { return this->pref_network_.c_str (); } @@ -303,7 +303,7 @@ TAO_ORB_Parameters::enforce_pref_interfaces (bool p) } bool -TAO_ORB_Parameters::enforce_pref_interfaces (void) const +TAO_ORB_Parameters::enforce_pref_interfaces () const { return this->enforce_preferred_interfaces_; } @@ -353,7 +353,7 @@ TAO_ORB_Parameters::protocols_hooks_name (const char *s) } const char * -TAO_ORB_Parameters::protocols_hooks_name (void) const +TAO_ORB_Parameters::protocols_hooks_name () const { return this->protocols_hooks_name_.c_str (); } @@ -365,7 +365,7 @@ TAO_ORB_Parameters::thread_lane_resources_manager_factory_name (const char *s) } const char * -TAO_ORB_Parameters::thread_lane_resources_manager_factory_name (void) const +TAO_ORB_Parameters::thread_lane_resources_manager_factory_name () const { return this->thread_lane_resources_manager_factory_name_.c_str (); } @@ -377,7 +377,7 @@ TAO_ORB_Parameters::dynamic_thread_pool_config_name (const char *s) } const char * -TAO_ORB_Parameters::dynamic_thread_pool_config_name (void) const +TAO_ORB_Parameters::dynamic_thread_pool_config_name () const { return this->dynamic_thread_pool_config_name_.c_str (); } @@ -389,7 +389,7 @@ TAO_ORB_Parameters::stub_factory_name (const char *s) } const char * -TAO_ORB_Parameters::stub_factory_name (void) const +TAO_ORB_Parameters::stub_factory_name () const { return this->stub_factory_name_.c_str (); } @@ -401,7 +401,7 @@ TAO_ORB_Parameters::poa_factory_name (const char *s) } const char * -TAO_ORB_Parameters::poa_factory_name (void) const +TAO_ORB_Parameters::poa_factory_name () const { return this->poa_factory_name_.c_str (); } @@ -413,7 +413,7 @@ TAO_ORB_Parameters::poa_factory_directive (const ACE_TCHAR *s) } const ACE_TCHAR * -TAO_ORB_Parameters::poa_factory_directive (void) const +TAO_ORB_Parameters::poa_factory_directive () const { return this->poa_factory_directive_.c_str (); } @@ -425,19 +425,19 @@ TAO_ORB_Parameters::endpoint_selector_factory_name (const char *s) } const char * -TAO_ORB_Parameters::endpoint_selector_factory_name (void) const +TAO_ORB_Parameters::endpoint_selector_factory_name () const { return this->endpoint_selector_factory_name_.c_str (); } const TAO::Invocation_Retry_Params & -TAO_ORB_Parameters::invocation_retry_params (void) const +TAO_ORB_Parameters::invocation_retry_params () const { return this->invocation_retry_params_; } TAO::Invocation_Retry_Params & -TAO_ORB_Parameters::invocation_retry_params (void) +TAO_ORB_Parameters::invocation_retry_params () { return this->invocation_retry_params_; } diff --git a/TAO/tao/params.h b/TAO/tao/params.h index 891e828d415..fe06a81b545 100644 --- a/TAO/tao/params.h +++ b/TAO/tao/params.h @@ -55,7 +55,7 @@ public: typedef ACE_Array_Map<ACE_CString, ACE_CString> endpoints_map_type; /// Constructor. - TAO_ORB_Parameters (void); + TAO_ORB_Parameters (); /// Specifies the endpoints on which this server is willing to /// listen for requests. @@ -70,41 +70,41 @@ public: /// Get/Set address:port for Multicast Discovery Protocol for /// the Naming Service. - const char *mcast_discovery_endpoint (void) const; + const char *mcast_discovery_endpoint () const; void mcast_discovery_endpoint (const char *mde); /// Set/Get the size to be used for a socket's receive buffer. - int sock_rcvbuf_size (void) const; + int sock_rcvbuf_size () const; void sock_rcvbuf_size (int); /// Set/Get the size to be used for a socket's send buffer. - int sock_sndbuf_size (void) const; + int sock_sndbuf_size () const; void sock_sndbuf_size (int); /// Set/Get the status of whether to use TCP_NODELAY or not. - int nodelay (void) const; + int nodelay () const; void nodelay (int); /// Set/Get whether we should set SO_KEEPALIVE on the socket or not. - int sock_keepalive (void); + int sock_keepalive (); void sock_keepalive (int); /// Set/Get whether we should set SO_DONTROUTE on the socket or not. - int sock_dontroute (void); + int sock_dontroute (); void sock_dontroute (int); /// Set/Get the number of hops to be used for datagrams sent through socket. - int ip_hoplimit (void); + int ip_hoplimit (); void ip_hoplimit (int); /// Set/Get whether we should set IP_MULTICAST_LOOP on the socket or not. - bool ip_multicastloop (void); + bool ip_multicastloop (); void ip_multicastloop (bool); /// Set/Get client side port span values - u_short iiop_client_port_base (void); + u_short iiop_client_port_base (); void iiop_client_port_base (u_short); - u_short iiop_client_port_span (void); + u_short iiop_client_port_span (); void iiop_client_port_span (u_short); /** @@ -113,7 +113,7 @@ public: * octet sequence is small enough and there is room in the current * message block it is more efficient just to copy the buffer. */ - int cdr_memcpy_tradeoff (void) const; + int cdr_memcpy_tradeoff () const; void cdr_memcpy_tradeoff (int); /** @@ -121,36 +121,36 @@ public: * kicks in. */ //@{ - ACE_CDR::ULong max_message_size (void) const; + ACE_CDR::ULong max_message_size () const; void max_message_size (ACE_CDR::ULong size); //@} /// The ORB will use the dotted decimal notation for addresses. By /// default we use the full ascii names. - int use_dotted_decimal_addresses (void) const; + int use_dotted_decimal_addresses () const; void use_dotted_decimal_addresses (int); /// The ORB will cache incoming connections against the dotted /// decimal form of the peer's address - int cache_incoming_by_dotted_decimal_address (void) const; + int cache_incoming_by_dotted_decimal_address () const; void cache_incoming_by_dotted_decimal_address (int); /// The ORB will turn off SO_LINGER if this is zero. - int linger (void) const; + int linger () const; void linger (int); /// The amount of time desired by the user to wait to accept /// connections after a particular type of accept() error. - time_t accept_error_delay (void) const; + time_t accept_error_delay () const; void accept_error_delay (time_t); /// Set/Get the Init Reference of an arbitrary ObjectID. - char *default_init_ref (void) const; + char *default_init_ref () const; void default_init_ref (const char *default_init_ref); /// Disable the OMG standard profile components, useful for /// homogenous environments. - bool std_profile_components (void) const; + bool std_profile_components () const; void std_profile_components (bool x); /// Scheduling policy. @@ -161,7 +161,7 @@ public: * ACE_Sched_Params::priority_min(). Legal values are ACE_SCHED_RR, * ACE_SCHED_FIFO, and ACE_SCHED_OTHER. */ - int ace_sched_policy (void) const; + int ace_sched_policy () const; void ace_sched_policy (int x); /// Scheduling policy flag. @@ -171,7 +171,7 @@ public: * thread creation functions. Legal values are THR_SCHED_RR, * THR_SCHED_FIFO, and THR_SCHED_DEFAULT. */ - long sched_policy (void) const; + long sched_policy () const; void sched_policy (long x); /// Scheduling scope flag. @@ -181,47 +181,47 @@ public: * thread creation functions. Legal values are THR_SCOPE_SYSTEM and * THR_SCOPE_PROCESS. */ - long scope_policy (void) const; + long scope_policy () const; void scope_policy (long x); /// Thread creation flags. /** * Shorthand for OR'ing together the scope_policy and sched_policy. */ - long thread_creation_flags (void) const; + long thread_creation_flags () const; /// Single read optimization. - int single_read_optimization (void) const; + int single_read_optimization () const; void single_read_optimization (int x); /// Create shared profiles without priority - int shared_profile (void) const; + int shared_profile () const; void shared_profile (int x); /// Want to use parallel connection attempts when profiles have multiple /// endpoints. - bool use_parallel_connects(void) const; + bool use_parallel_connects() const; void use_parallel_connects (bool x); /// The milliseconds delay used to stagger individual connection starts /// when using parallel connects. - unsigned long parallel_connect_delay (void) const; + unsigned long parallel_connect_delay () const; void parallel_connect_delay (unsigned long x); /// Mutators and accessors for rt_collocation_resolver - bool disable_rt_collocation_resolver (void) const; + bool disable_rt_collocation_resolver () const; void disable_rt_collocation_resolver (bool); /// Accepts the list of preferred interfaces and does a simple /// semantic check on the string before setting. Also the getter. bool preferred_interfaces (const char *s); - const char *preferred_interfaces (void) const; + const char *preferred_interfaces () const; /// Utility function called by the preferred interfaces setter static bool check_preferred_interfaces_string (const char *); void enforce_pref_interfaces (bool p); - bool enforce_pref_interfaces (void) const; + bool enforce_pref_interfaces () const; #if defined (ACE_HAS_IPV6) void prefer_ipv6_interfaces (bool p); @@ -235,49 +235,49 @@ public: #endif /* ACE_HAS_IPV6 */ void negotiate_codesets (bool c); - bool negotiate_codesets (void) const; + bool negotiate_codesets () const; void ami_collication (bool opt); - bool ami_collication (void) const; + bool ami_collication () const; void protocols_hooks_name (const char *s); - const char *protocols_hooks_name (void) const; + const char *protocols_hooks_name () const; void thread_lane_resources_manager_factory_name (const char *s); - const char *thread_lane_resources_manager_factory_name (void) const; + const char *thread_lane_resources_manager_factory_name () const; void dynamic_thread_pool_config_name (const char *s); - const char *dynamic_thread_pool_config_name (void) const; + const char *dynamic_thread_pool_config_name () const; void stub_factory_name (const char *s); - const char *stub_factory_name (void) const; + const char *stub_factory_name () const; void poa_factory_name (const char *s); - const char *poa_factory_name (void) const; + const char *poa_factory_name () const; void poa_factory_directive (const ACE_TCHAR *s); - const ACE_TCHAR *poa_factory_directive (void) const; + const ACE_TCHAR *poa_factory_directive () const; void endpoint_selector_factory_name (const char *s); - const char *endpoint_selector_factory_name (void) const; + const char *endpoint_selector_factory_name () const; void collocation_resolver_name (const char *s); - const char *collocation_resolver_name (void) const; + const char *collocation_resolver_name () const; void forward_invocation_on_object_not_exist (bool opt); - bool forward_invocation_on_object_not_exist (void) const; + bool forward_invocation_on_object_not_exist () const; void forward_on_exception_limit (const int ef, const int limit); void forward_on_exception_delay (const ACE_Time_Value &delay); - TAO::Invocation_Retry_Params &invocation_retry_params (void); - const TAO::Invocation_Retry_Params &invocation_retry_params (void) const; + TAO::Invocation_Retry_Params &invocation_retry_params (); + const TAO::Invocation_Retry_Params &invocation_retry_params () const; void forward_once_exception (const int ef); int forward_once_exception () const; void allow_ziop_no_server_policies (bool opt); - bool allow_ziop_no_server_policies (void) const; + bool allow_ziop_no_server_policies () const; private: /// Each "endpoint" is of the form: diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc index 57036a486f1..a816e0ce154 100644 --- a/TAO/tao/tao.mpc +++ b/TAO/tao/tao.mpc @@ -492,7 +492,6 @@ project(TAO) : acelib, install, tao_output, taodefaults, pidl, extra_core, taoid Messaging_PolicyValueS.h Messaging_SyncScopeC.h Messaging_SyncScopeS.h - MM_Sequence_Iterator_T.h MMAP_Allocator.h MProfile.h Muxed_TMS.h diff --git a/TAO/tao/target_specification.h b/TAO/tao/target_specification.h index f8f816ec7fd..b4dc72e825b 100644 --- a/TAO/tao/target_specification.h +++ b/TAO/tao/target_specification.h @@ -56,7 +56,7 @@ class TAO_Export TAO_Target_Specification public: /// Ctor - TAO_Target_Specification (void); + TAO_Target_Specification (); enum TAO_Target_Address { // Note that this could be extended for other protocols @@ -86,14 +86,14 @@ public: * the stored specifier is not of the right type then this would * return a NULL */ - const TAO::ObjectKey* object_key (void); + const TAO::ObjectKey* object_key (); /** * Returns the IOP::TaggedProfile after a check of the stored specifier. If * the stored specifier is not of the right type then this would * return a NULL */ - const IOP::TaggedProfile *profile (void); + const IOP::TaggedProfile *profile (); /** * Returns a pointer to IOP::IOR through the parameters and the @@ -104,7 +104,7 @@ public: CORBA::ULong iop_ior (IOP::IOR *&ior); /// Access the TArget_Address specifier - TAO_Target_Address specifier (void); + TAO_Target_Address specifier (); private: /// The union of all the possibilities diff --git a/TAO/tao/varbase.h b/TAO/tao/varbase.h index b07f0c1f906..6cb0b769609 100644 --- a/TAO/tao/varbase.h +++ b/TAO/tao/varbase.h @@ -31,7 +31,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Base_var { public: - TAO_Base_var (void) {} + TAO_Base_var () {} private: |