diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-12-09 12:39:57 +0100 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-12-09 12:39:57 +0100 |
commit | 6f91193f0b537d437645ae9e10823a519f547888 (patch) | |
tree | 224ad9643523a625196045f37ead1a4e73ddc1f9 /TAO | |
parent | fb7e13241cc5ebd590e32ec4343a75d53691cda6 (diff) | |
download | ATCD-6f91193f0b537d437645ae9e10823a519f547888.tar.gz |
Removed redundant void
Diffstat (limited to 'TAO')
119 files changed, 999 insertions, 999 deletions
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/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.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.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/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.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/Any_Impl.h b/TAO/tao/AnyTypeCode/Any_Impl.h index 2446ec37368..c5682d07878 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl.h +++ b/TAO/tao/AnyTypeCode/Any_Impl.h @@ -69,16 +69,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 +90,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_; 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_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/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/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_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/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/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_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.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.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/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/Bounded_Basic_String_Sequence_T.h b/TAO/tao/Bounded_Basic_String_Sequence_T.h index b3c667e962a..a249e9110ff 100644 --- a/TAO/tao/Bounded_Basic_String_Sequence_T.h +++ b/TAO/tao/Bounded_Basic_String_Sequence_T.h @@ -37,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() diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h index 3efeca9a5ca..16d1d0eaa83 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. @@ -414,12 +414,12 @@ public: #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/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/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/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/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.h b/TAO/tao/Exception.h index 3e20fd0b4e5..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; @@ -177,11 +177,11 @@ namespace CORBA * }; * </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/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_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/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/Generic_Sequence_T.h b/TAO/tao/Generic_Sequence_T.h index 33e507af217..07a46d0d6f4 100644 --- a/TAO/tao/Generic_Sequence_T.h +++ b/TAO/tao/Generic_Sequence_T.h @@ -78,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()) diff --git a/TAO/tao/Intrusive_Ref_Count_Base_T.h b/TAO/tao/Intrusive_Ref_Count_Base_T.h index c4c6f181b75..26092e3a8e0 100644 --- a/TAO/tao/Intrusive_Ref_Count_Base_T.h +++ b/TAO/tao/Intrusive_Ref_Count_Base_T.h @@ -43,13 +43,13 @@ 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) 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/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/ORB.h b/TAO/tao/ORB.h index 96650f39713..f9645906948 100644 --- a/TAO/tao/ORB.h +++ b/TAO/tao/ORB.h @@ -171,18 +171,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 +209,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 +284,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 +381,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 +417,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 +434,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 +460,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 +492,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 +510,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 +532,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 +543,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 +568,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); diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h index 4437dc95601..c7a11210b3c 100644 --- a/TAO/tao/ORB_Core.h +++ b/TAO/tao/ORB_Core.h @@ -171,7 +171,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 +186,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 +250,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 +272,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 +315,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 +358,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 +437,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 +540,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 +549,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 +567,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 +582,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 @@ -628,53 +628,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 +682,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 +748,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 +782,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 +807,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 +820,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 +839,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 +876,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 +918,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 +926,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 +935,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 +986,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 +1005,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 @@ -1306,7 +1306,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 +1376,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 +1392,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_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.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/Object.h b/TAO/tao/Object.h index 92c2e499c85..8f2cb4239da 100644 --- a/TAO/tao/Object.h +++ b/TAO/tao/Object.h @@ -102,7 +102,7 @@ namespace CORBA { public: /// Destructor. - virtual ~Object (void); + virtual ~Object (); /** * @name Spec defined methods @@ -115,7 +115,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); @@ -131,7 +131,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. @@ -152,18 +152,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. @@ -217,7 +217,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 @@ -227,13 +227,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. @@ -251,15 +251,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*); @@ -272,7 +272,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, @@ -283,8 +283,8 @@ 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); @@ -304,10 +304,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. /** @@ -315,14 +315,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 @@ -331,7 +331,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. @@ -412,7 +412,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); }; @@ -429,7 +429,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.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.h b/TAO/tao/Object_KeyC.h index 9854f40b8d0..f0f60ee07bb 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, @@ -98,7 +98,7 @@ namespace TAO 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.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_Ref_Table.h b/TAO/tao/Object_Ref_Table.h index 4b54007f178..fb7ca8039ae 100644 --- a/TAO/tao/Object_Ref_Table.h +++ b/TAO/tao/Object_Ref_Table.h @@ -56,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 @@ -78,18 +78,18 @@ 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: /** 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/PI/ClientRequestDetails.h b/TAO/tao/PI/ClientRequestDetails.h index 2aa46394c6a..20bea1628e7 100644 --- a/TAO/tao/PI/ClientRequestDetails.h +++ b/TAO/tao/PI/ClientRequestDetails.h @@ -50,7 +50,7 @@ namespace TAO { public: - ClientRequestDetails (void); + ClientRequestDetails (); void apply_policies (const CORBA::PolicyList& policies); 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.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/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.h b/TAO/tao/PI/PICurrent.h index c5fb1391941..ec3098c6615 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,7 +98,7 @@ namespace TAO * counted, and should not be destroyed using delete() by anything * other than the reference counting mechanism. */ - virtual ~PICurrent (void); + virtual ~PICurrent (); private: /// Prevent copying through the copy constructor and the assignment diff --git a/TAO/tao/PI/PICurrent_Impl.h b/TAO/tao/PI/PICurrent_Impl.h index 3d22b82bb1e..785f7575416 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) diff --git a/TAO/tao/PI/PolicyFactoryC.h b/TAO/tao/PI/PolicyFactoryC.h index 0b2dfabc75b..c1d03d3031f 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. diff --git a/TAO/tao/PI/RequestInfo_Util.h b/TAO/tao/PI/RequestInfo_Util.h index b0c48d878bf..56537358735 100644 --- a/TAO/tao/PI/RequestInfo_Util.h +++ b/TAO/tao/PI/RequestInfo_Util.h @@ -60,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.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.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.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.h b/TAO/tao/PI_Server/PI_Server_Loader.h index b7079eb7c0d..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* []); diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.h b/TAO/tao/PI_Server/ServerInterceptorAdapter.h index 6a5b7f25d12..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 @@ -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 1727d249013..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); diff --git a/TAO/tao/PI_Server/ServerRequestInfo.h b/TAO/tao/PI_Server/ServerRequestInfo.h index 98b1267f71a..279a231b79c 100644 --- a/TAO/tao/PI_Server/ServerRequestInfo.h +++ b/TAO/tao/PI_Server/ServerRequestInfo.h @@ -80,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. /** @@ -115,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); @@ -141,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. @@ -207,7 +207,7 @@ 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 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.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.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/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.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/Active_Policy_Strategies.h b/TAO/tao/PortableServer/Active_Policy_Strategies.h index 2e38ebd132e..b683ed244eb 100644 --- a/TAO/tao/PortableServer/Active_Policy_Strategies.h +++ b/TAO/tao/PortableServer/Active_Policy_Strategies.h @@ -50,26 +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); - 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_; @@ -97,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/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/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/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/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/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.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/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/Object_Adapter.h b/TAO/tao/PortableServer/Object_Adapter.h index d4d30ebd322..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 &); @@ -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/POA_Cached_Policies.h b/TAO/tao/PortableServer/POA_Cached_Policies.h index af484d586d1..491b9833d83 100644 --- a/TAO/tao/PortableServer/POA_Cached_Policies.h +++ b/TAO/tao/PortableServer/POA_Cached_Policies.h @@ -57,7 +57,7 @@ namespace TAO Cached_Policies (); - ~Cached_Policies (void); + ~Cached_Policies (); /// Update the cached policy values. void update (TAO_POA_Policy_Set &policy_set); @@ -66,30 +66,30 @@ namespace TAO * @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. 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_Impl.h b/TAO/tao/PortableServer/POA_Current_Impl.h index deebafdfd71..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,28 +111,28 @@ 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); diff --git a/TAO/tao/PortableServer/POA_Policy_Set.h b/TAO/tao/PortableServer/POA_Policy_Set.h index 373a3b9f1a8..8cc73b11ebe 100644 --- a/TAO/tao/PortableServer/POA_Policy_Set.h +++ b/TAO/tao/PortableServer/POA_Policy_Set.h @@ -29,18 +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); @@ -55,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/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/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/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/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/Servant_Base.h b/TAO/tao/PortableServer/Servant_Base.h index 1cc77f3bed1..995b6eb0293 100644 --- a/TAO/tao/PortableServer/Servant_Base.h +++ b/TAO/tao/PortableServer/Servant_Base.h @@ -69,7 +69,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 +108,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 +155,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, 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/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/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/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/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/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/Resource_Factory.h b/TAO/tao/Resource_Factory.h index 3f0b1812327..ab672ad3aec 100644 --- a/TAO/tao/Resource_Factory.h +++ b/TAO/tao/Resource_Factory.h @@ -58,14 +58,14 @@ 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); @@ -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/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.h b/TAO/tao/ServerRequestInterceptor_Adapter.h index 9c2c354d595..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 @@ -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.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.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.h b/TAO/tao/Service_Callbacks.h index 1fd5c281e78..5eddb99847f 100644 --- a/TAO/tao/Service_Callbacks.h +++ b/TAO/tao/Service_Callbacks.h @@ -67,7 +67,7 @@ public: }; /// 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 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_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/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/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/SystemException.h b/TAO/tao/SystemException.h index 937c045e5ad..f52e0414820 100644 --- a/TAO/tao/SystemException.h +++ b/TAO/tao/SystemException.h @@ -55,7 +55,7 @@ namespace CORBA namespace TAO { - typedef CORBA::SystemException* (*excp_factory)(void); + typedef CORBA::SystemException* (*excp_factory)(); } namespace CORBA @@ -99,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); @@ -119,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. @@ -129,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; @@ -143,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/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/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/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/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_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/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/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_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/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/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/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: |