diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Naming')
21 files changed, 102 insertions, 102 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp index 2266e5903fa..7314bc1c34e 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp @@ -23,7 +23,7 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::TAO_Bindings_Iterator ( } template <class ITERATOR, class TABLE_ENTRY> -TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::~TAO_Bindings_Iterator (void) +TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::~TAO_Bindings_Iterator () { delete hash_iter_; @@ -157,7 +157,7 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_n ( } template <class ITERATOR, class TABLE_ENTRY> void -TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::destroy (void) +TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::destroy () { // Check to make sure this object is still valid. if (this->destroyed_) diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h index 22d6ac41ac9..fc2193ccb7e 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h @@ -58,10 +58,10 @@ public: PortableServer::POA_ptr poa); /// Destructor. - ~TAO_Bindings_Iterator (void); + ~TAO_Bindings_Iterator (); /// Returns the Default POA of this Servant object - virtual PortableServer::POA_ptr _default_POA (void); + virtual PortableServer::POA_ptr _default_POA (); // = Idl methods. @@ -78,7 +78,7 @@ public: CosNaming::BindingList_out bl); /// This operation destroys the iterator. - void destroy (void); + void destroy (); // = Helper method. diff --git a/TAO/orbsvcs/orbsvcs/Naming/Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Entries.h index c3250e3e6f4..e619665c582 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Entries.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Entries.h @@ -41,7 +41,7 @@ class TAO_Naming_Serv_Export TAO_IntId { public: /// Constructor. - TAO_IntId (void); + TAO_IntId (); /// Constructor. TAO_IntId (CORBA::Object_ptr obj, @@ -51,7 +51,7 @@ public: TAO_IntId (const TAO_IntId & rhs); /// Destructor. - ~TAO_IntId (void); + ~TAO_IntId (); /// Assignment operator (does copy memory). void operator= (const TAO_IntId & rhs); @@ -121,10 +121,10 @@ public: // = Accessors /// Return id_ in a const char * format. - const char * id (void); + const char * id (); /// Return kind_ in a const char * format. - const char * kind (void); + const char * kind (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h index 5dac7989663..182737db5d7 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h @@ -281,7 +281,7 @@ public: void set_global_strategy (const ACE_TCHAR *strat_name); /// Destructor. - ~TAO_FT_Naming_Manager (void); + ~TAO_FT_Naming_Manager (); private: /// A utility to ensure we can access the latest object reference for diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.h index 6bf7d63ff8a..a841cff7d9e 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.h +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.h @@ -70,12 +70,12 @@ public: TAO_FT_Naming_Replication_Manager (TAO_FT_Naming_Server &owner); - virtual ~TAO_FT_Naming_Replication_Manager(void); + virtual ~TAO_FT_Naming_Replication_Manager(); virtual int svc (); virtual int handle_exception (ACE_HANDLE ); - void stop (void); + void stop (); void send_context_update (const ACE_CString &ctx, FT_Naming::ChangeType update); void send_objgrp_update (PortableGroup::ObjectGroupId id, @@ -88,8 +88,8 @@ public: void send_registration (bool use_combo); bool update_peer_registration (); - bool peer_available (void); - char * ior (void); + bool peer_available (); + char * ior (); private: Replica_var me_; diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h index 98c8d1492f8..e24e86bfcae 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h @@ -85,11 +85,11 @@ public: /// Returns 0 on successful pairing with peer. /// Returns 1 if peer IOR file is present, but peer is not responding /// Returns -1 if pairing is not possible. - void init_replication_pairing (void); + void init_replication_pairing (); - void no_replica (void); + void no_replica (); - // TAO_FTNS_Notifier ¬ifier (void); + // TAO_FTNS_Notifier ¬ifier (); /// Overridden parse operation. Only allows options supported by the FT_Naming_Server /// and adds options for the object group manager @@ -104,7 +104,7 @@ public: /// Factory method to create a naming context factory for use with /// the -f option. virtual TAO_Persistent_Naming_Context_Factory * - persistent_naming_context_factory (void); + persistent_naming_context_factory (); /// Returns the IOR of the replication manager. char* replicator_ior (); @@ -148,7 +148,7 @@ protected: IOR_ARRAY_SIZE }; - int recover_iors (void); + int recover_iors (); /// The object that implements the ObjectGroupManager, PropertyManager, /// and GenericFactory interfaces. diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h index 572b5251d65..84f16595d30 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h @@ -80,13 +80,13 @@ public: */ virtual void stale (bool is_stale); - virtual bool stale (void); + virtual bool stale (); /** * An internal utility used to signal that this context was updated. * Check the last_changed_ attribute for the time of the write. */ - void context_written (void); + void context_written (); /** * An internal callback invoked by the File_Open_Lock_and_Check diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.h index 84ea1bcefac..0777beee44e 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.h @@ -47,7 +47,7 @@ public: /// this class goes out of scope, its hash_map remains in persistent storage. virtual ~TAO_FT_Storable_Naming_Context_Factory () = default; - TAO_FT_Naming_Replication_Manager * replicator (void); + TAO_FT_Naming_Replication_Manager * replicator (); /// Factory method for creating an implementation object for naming contexts. /// If an existing naming context implementation is being rebuilt, diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.h index f39b02dc0bb..47d139210bd 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.h +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.h @@ -66,7 +66,7 @@ public: * * @return 0 on success, -1 on failure, -2 on bad argument. */ - int group_list (void); + int group_list (); /** * The naming service shall provide a command line utility to modify the load diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h index ca66d6f9fd6..96dc10c433e 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h @@ -50,7 +50,7 @@ class TAO_Naming_Serv_Export TAO_Bindings_Map { public: /// Destructor. - virtual ~TAO_Bindings_Map (void); + virtual ~TAO_Bindings_Map (); /// Return current number of entries (name bindings) in the /// underlying hash map. @@ -119,20 +119,20 @@ public: void interface (TAO_Naming_Context *i); /// Destructor. - virtual ~TAO_Hash_Naming_Context (void); + virtual ~TAO_Hash_Naming_Context (); // = Accessors. /// Get the pointer to our interface. - TAO_Naming_Context *interface (void); + TAO_Naming_Context *interface (); /// Returns true if this Naming Context is a root Naming Context for /// the server, and false otherwise. - int root (void); + int root (); /// Returns true if this context had <destroy> operation invoked on /// it, and false otherwise. - int destroyed (void); + int destroyed (); // = CosNaming::NamingContext idl interface methods. @@ -205,12 +205,12 @@ public: * NOTE: after <destroy> is invoked on a Naming Context, all * BindingIterators associated with that Naming Context are also destroyed. */ - virtual void destroy (void); + virtual void destroy (); /// Returns the Default POA of this Servant object - virtual PortableServer::POA_ptr _default_POA (void); + virtual PortableServer::POA_ptr _default_POA (); - TAO_SYNCH_RW_MUTEX &lock (void); + TAO_SYNCH_RW_MUTEX &lock (); protected: // = Helper method used by other methods. diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.h index e09e93c265d..545608747af 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.h @@ -39,7 +39,7 @@ class TAO_Naming_Export TAO_Naming_Client { public: /// Default constructor. - TAO_Naming_Client (void); + TAO_Naming_Client (); /** * Look for a Naming Service for a period of @a timeout using @@ -49,7 +49,7 @@ public: int init (CORBA::ORB_ptr orb, ACE_Time_Value *timeout = 0); /// Destructor. - ~TAO_Naming_Client (void); + ~TAO_Naming_Client (); /// Returns a pointer to the root Naming Context. CosNaming::NamingContext_ptr operator-> () const; diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h index b4a98572a2a..854368998e1 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h @@ -49,7 +49,7 @@ public: TAO_Naming_Context (TAO_Naming_Context_Impl *impl); /// Destructor. - ~TAO_Naming_Context (void); + ~TAO_Naming_Context (); // = CosNaming::NamingContext idl interface methods. @@ -131,7 +131,7 @@ public: * NOTE: after <destroy> is invoked on a Naming Context, all * BindingIterators associated with that Naming Context are also destroyed. */ - virtual void destroy (void); + virtual void destroy (); /** * Returns at most the requested number of bindings <how_many> in @@ -180,7 +180,7 @@ public: void stale (bool value); /// Returns the Default POA of this Servant object - virtual PortableServer::POA_ptr _default_POA (void); + virtual PortableServer::POA_ptr _default_POA (); private: enum Hint @@ -243,7 +243,7 @@ class TAO_Naming_Serv_Export TAO_Naming_Context_Impl { public: /// Destructor. - virtual ~TAO_Naming_Context_Impl (void); + virtual ~TAO_Naming_Context_Impl (); // = CosNaming::NamingContext idl interface methods. @@ -347,7 +347,7 @@ public: * Query if the the implementation is stale for replicated * persistence support. */ - virtual bool stale (void); + virtual bool stale (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h index a01b6ba4aaf..58645108b88 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h @@ -128,10 +128,10 @@ public: virtual int fini (); /// Destructor. - virtual ~TAO_Naming_Server (void); + virtual ~TAO_Naming_Server (); /// Returns the IOR of the naming service. - char * naming_service_ior (void); + char * naming_service_ior (); /// Returns a <NamingContext_ptr> for the root Naming Context. CosNaming::NamingContext_ptr operator-> () const; @@ -188,7 +188,7 @@ protected: * the -f option. */ virtual TAO_Persistent_Naming_Context_Factory * - persistent_naming_context_factory (void); + persistent_naming_context_factory (); /// The ior_multicast event handler. TAO_IOR_Multicast *ior_multicast_; diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp index babe95ecbab..490b057d00d 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp @@ -24,7 +24,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_NS_Node) template <class T> -ACE_NS_Node<T>::~ACE_NS_Node (void) +ACE_NS_Node<T>::~ACE_NS_Node () { } @@ -85,7 +85,7 @@ ACE_Unbounded_List<T>::insert_tail (const T &item) } template <class T> void -ACE_Unbounded_List<T>::reset (void) +ACE_Unbounded_List<T>::reset () { ACE_TRACE ("reset"); @@ -125,7 +125,7 @@ ACE_Unbounded_List<T>::copy_nodes (const ACE_Unbounded_List<T> &us) } template <class T> void -ACE_Unbounded_List<T>::delete_nodes (void) +ACE_Unbounded_List<T>::delete_nodes () { ACE_NS_Node<T> *curr = this->head_->next_; @@ -147,7 +147,7 @@ ACE_Unbounded_List<T>::delete_nodes (void) } template <class T> -ACE_Unbounded_List<T>::~ACE_Unbounded_List (void) +ACE_Unbounded_List<T>::~ACE_Unbounded_List () { // ACE_TRACE ("ACE_Unbounded_List<T>::~ACE_Unbounded_List"); @@ -246,14 +246,14 @@ ACE_Unbounded_List<T>::remove (const T &item) } template <class T> ACE_Unbounded_List_Iterator<T> -ACE_Unbounded_List<T>::begin (void) +ACE_Unbounded_List<T>::begin () { // ACE_TRACE ("ACE_Unbounded_List<T>::begin"); return ACE_Unbounded_List_Iterator<T> (*this); } template <class T> ACE_Unbounded_List_Iterator<T> -ACE_Unbounded_List<T>::end (void) +ACE_Unbounded_List<T>::end () { // ACE_TRACE ("ACE_Unbounded_List<T>::end"); return ACE_Unbounded_List_Iterator<T> (*this, 1); @@ -277,7 +277,7 @@ ACE_Unbounded_List_Iterator<T>::ACE_Unbounded_List_Iterator (ACE_Unbounded_List< } template <class T> int -ACE_Unbounded_List_Iterator<T>::advance (void) +ACE_Unbounded_List_Iterator<T>::advance () { // ACE_TRACE ("ACE_Unbounded_List_Iterator<T>::advance"); this->current_ = this->current_->next_; @@ -285,7 +285,7 @@ ACE_Unbounded_List_Iterator<T>::advance (void) } template <class T> int -ACE_Unbounded_List_Iterator<T>::first (void) +ACE_Unbounded_List_Iterator<T>::first () { // ACE_TRACE ("ACE_Unbounded_List_Iterator<T>::first"); this->current_ = this->set_->head_->next_; @@ -326,7 +326,7 @@ ACE_Unbounded_List_Iterator<T>::operator++ (int) } template <class T> ACE_Unbounded_List_Iterator<T>& -ACE_Unbounded_List_Iterator<T>::operator++ (void) +ACE_Unbounded_List_Iterator<T>::operator++ () { // ACE_TRACE ("ACE_Unbounded_List_Iterator<T>::operator++ (void)"); @@ -337,7 +337,7 @@ ACE_Unbounded_List_Iterator<T>::operator++ (void) } template <class T> T& -ACE_Unbounded_List_Iterator<T>::operator* (void) +ACE_Unbounded_List_Iterator<T>::operator* () { //ACE_TRACE ("ACE_Unbounded_List_Iterator<T>::operator*"); T *retv = 0; diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h index df514f3a72a..8897a02cde2 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h @@ -44,7 +44,7 @@ public: friend class ACE_Unbounded_List<T>; friend class ACE_Unbounded_List_Iterator<T>; - ~ACE_NS_Node (void); + ~ACE_NS_Node (); private: ACE_NS_Node (const T &i, ACE_NS_Node<T> *n); @@ -76,11 +76,11 @@ public: /// Move forward by one element in the List. Returns 0 when all the /// items in the List have been seen, else 1. - int advance (void); + int advance (); /// Move to the first element in the List. Returns 0 if the /// List is empty, else 1. - int first (void); + int first (); /// Returns 1 when all items have been seen, else 0. int done () const; @@ -94,10 +94,10 @@ public: ACE_Unbounded_List_Iterator<T> operator++ (int); /// Prefix advance. - ACE_Unbounded_List_Iterator<T>& operator++ (void); + ACE_Unbounded_List_Iterator<T>& operator++ (); /// Returns a reference to the interal element <this> is pointing to. - T& operator* (void); + T& operator* (); /// Check if two iterators point to the same position bool operator== (const ACE_Unbounded_List_Iterator<T> &) const; @@ -144,7 +144,7 @@ public: void operator= (const ACE_Unbounded_List<T> &); /// Destructor. - ~ACE_Unbounded_List (void); + ~ACE_Unbounded_List (); // = Check boundary conditions. @@ -177,11 +177,11 @@ public: void dump () const; /// Reset the <ACE_Unbounded_List> to be empty. - void reset (void); + void reset (); // = STL-styled unidirectional iterator factory. - ACE_Unbounded_List_Iterator<T> begin (void); - ACE_Unbounded_List_Iterator<T> end (void); + ACE_Unbounded_List_Iterator<T> begin (); + ACE_Unbounded_List_Iterator<T> end (); /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -192,7 +192,7 @@ private: int insert_tail (const T &item); /// Delete all the nodes in the List. - void delete_nodes (void); + void delete_nodes (); /// Copy nodes into this set. void copy_nodes (const ACE_Unbounded_List<T> &); diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h index 82aba1c6c65..dda89d4974a 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h @@ -99,7 +99,7 @@ public: * not deleted, since we want it to keep the state of the Naming * Service until the next run. */ - ~TAO_Persistent_Context_Index (void); + ~TAO_Persistent_Context_Index (); // = Methods for adding/removing entries. @@ -117,14 +117,14 @@ public: // = Accessors. /// Return allocator. - ACE_Allocator *allocator (void); + ACE_Allocator *allocator (); /// Return orb pointer. - CORBA::ORB_ptr orb (void); + CORBA::ORB_ptr orb (); /// Return a pointer to the root Naming Context (returns a copy - must be /// deallocated by the user). - CosNaming::NamingContext_ptr root_context (void); + CosNaming::NamingContext_ptr root_context (); private: /// Helper for the <init> method. Iterates over <index_>, and diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h index e2d89857f97..69bcbc26986 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h @@ -41,7 +41,7 @@ class TAO_Naming_Serv_Export TAO_Persistent_IntId { public: /// Constructor. - TAO_Persistent_IntId (void); + TAO_Persistent_IntId (); /// Constructor. TAO_Persistent_IntId (char * obj_ref, @@ -51,7 +51,7 @@ public: TAO_Persistent_IntId (const TAO_Persistent_IntId & rhs); /// Destructor. - ~TAO_Persistent_IntId (void); + ~TAO_Persistent_IntId (); /// Assignment operator. void operator= (const TAO_Persistent_IntId & rhs); @@ -83,7 +83,7 @@ class TAO_Naming_Serv_Export TAO_Persistent_ExtId { public: /// Constructor. - TAO_Persistent_ExtId (void); + TAO_Persistent_ExtId (); /// Constructor. TAO_Persistent_ExtId (const char *id, @@ -93,7 +93,7 @@ public: TAO_Persistent_ExtId (const TAO_Persistent_ExtId & rhs); /// Destructor. - ~TAO_Persistent_ExtId (void); + ~TAO_Persistent_ExtId (); // = Assignment and comparison methods. @@ -122,8 +122,8 @@ public: // Accessors. - const char * id (void); - const char * kind (void); + const char * id (); + const char * kind (); }; /** @@ -143,7 +143,7 @@ class TAO_Naming_Serv_Export TAO_Persistent_Index_IntId { public: /// Constructor. - TAO_Persistent_Index_IntId (void); + TAO_Persistent_Index_IntId (); /// Constructor. TAO_Persistent_Index_IntId (ACE_UINT32 *counter, @@ -154,7 +154,7 @@ public: TAO_Persistent_Index_IntId (const TAO_Persistent_Index_IntId & rhs); /// Destructor. - ~TAO_Persistent_Index_IntId (void); + ~TAO_Persistent_Index_IntId (); /// Assignment operator (does copy memory). void operator= (const TAO_Persistent_Index_IntId & rhs); @@ -186,7 +186,7 @@ class TAO_Naming_Serv_Export TAO_Persistent_Index_ExtId { public: /// Constructor. - TAO_Persistent_Index_ExtId (void); + TAO_Persistent_Index_ExtId (); /// Constructor. TAO_Persistent_Index_ExtId (const char *poa_id); @@ -195,7 +195,7 @@ public: TAO_Persistent_Index_ExtId (const TAO_Persistent_Index_ExtId & rhs); /// Destructor. - ~TAO_Persistent_Index_ExtId (void); + ~TAO_Persistent_Index_ExtId (); // = Assignment and comparison methods. diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h index ca8c7300426..deb839039e8 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h @@ -178,7 +178,7 @@ public: ACE_UINT32 *counter = 0); /// Destructor. - virtual ~TAO_Persistent_Naming_Context (void); + virtual ~TAO_Persistent_Naming_Context (); // = Utility methods. /** @@ -200,7 +200,7 @@ public: * same naming server in which the operation was invoked. The * context is not bound. */ - virtual CosNaming::NamingContext_ptr new_context (void); + virtual CosNaming::NamingContext_ptr new_context (); /** * Returns at most the requested number of bindings @a how_many in diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h index 420fd723648..ef6222589ed 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h @@ -37,7 +37,7 @@ class TAO_Naming_Serv_Export TAO_Storable_IntId { public: /// Constructor. - TAO_Storable_IntId (void); + TAO_Storable_IntId (); /// Constructor. TAO_Storable_IntId (/* in */ const char * ior, @@ -47,7 +47,7 @@ public: TAO_Storable_IntId (const TAO_Storable_IntId & rhs); /// Destructor. - ~TAO_Storable_IntId (void); + ~TAO_Storable_IntId (); /// Assignment operator. void operator= (const TAO_Storable_IntId & rhs); @@ -65,7 +65,7 @@ class TAO_Naming_Serv_Export TAO_Storable_ExtId { public: /// Constructor. - TAO_Storable_ExtId (void); + TAO_Storable_ExtId (); /// Constructor. TAO_Storable_ExtId (/* in */ const char *id, @@ -75,7 +75,7 @@ public: TAO_Storable_ExtId (const TAO_Storable_ExtId & rhs); /// Destructor. - ~TAO_Storable_ExtId (void); + ~TAO_Storable_ExtId (); // = Assignment and comparison methods. @@ -105,8 +105,8 @@ public: // Accessors. // follow the mapping rules! - const char * id (void); - const char * kind (void); + const char * id (); + const char * kind (); }; @@ -131,19 +131,19 @@ public: TAO_Storable_Bindings_Map (size_t hash_table_size, CORBA::ORB_ptr orb); /// Destructor. - virtual ~TAO_Storable_Bindings_Map (void); + virtual ~TAO_Storable_Bindings_Map (); // = Accessors. /// Get a reference to the underlying hash map. - HASH_MAP &map (void); + HASH_MAP &map (); /// Return the size of the underlying hash table. - size_t total_size (void); + size_t total_size (); /// Return current number of entries (name bindings) in the /// underlying hash map. - virtual size_t current_size (void); + virtual size_t current_size (); // = Name bindings manipulation methods. @@ -228,7 +228,7 @@ public: size_t hash_table_size = ACE_DEFAULT_MAP_SIZE); /// Destructor. - virtual ~TAO_Storable_Naming_Context (void); + virtual ~TAO_Storable_Naming_Context (); // = Utility methods. /** @@ -264,7 +264,7 @@ public: * same naming server in which the operation was invoked. The * context is not bound. */ - virtual CosNaming::NamingContext_ptr new_context (void); + virtual CosNaming::NamingContext_ptr new_context (); /** * Returns at most the requested number of bindings <how_many> in @@ -342,14 +342,14 @@ public: * NOTE: after <destroy> is invoked on a Naming Context, all * BindingIterators associated with that Naming Context are also destroyed. */ - virtual void destroy (void); + virtual void destroy (); protected: /** * A helper function to ensure the current object was not destroyed by raising * an exception if it was. Uses the lock as a Reader. */ - void verify_not_destroyed (void); + void verify_not_destroyed (); /** * A helper function to validate the name argument and return a final context @@ -364,7 +364,7 @@ protected: * This will have been done after the file is closed. Check the * last_changed_ attribute for the time of the write. */ - virtual void context_written (void); + virtual void context_written (); /** * An internal callback invoked by the File_Open_Lock_and_Check @@ -440,11 +440,11 @@ protected: /// Check if the guarded object is current with the last /// update which could have been performed independently of /// the owner of this object. - virtual bool object_obsolete (void); + virtual bool object_obsolete (); /// Mark the object as current with respect to the /// file to which it was persisted. - virtual void mark_object_current (void); + virtual void mark_object_current (); /// Mark the time at which the object was modified and virtual void set_object_last_changed (const time_t & time); @@ -461,7 +461,7 @@ protected: private: /// Default constructor - File_Open_Lock_and_Check(void); + File_Open_Lock_and_Check(); TAO_Storable_Naming_Context * context_; }; // end of embedded class File_Open_Lock_and_Check diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Factory.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Factory.h index 934790c6548..9ace464e04d 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Factory.h @@ -44,7 +44,7 @@ public: /// Destructor. Does not deallocate the hash map: if an instance of /// this class goes out of scope, its hash_map remains in persistent storage. - virtual ~TAO_Storable_Naming_Context_Factory (void); + virtual ~TAO_Storable_Naming_Context_Factory (); /// Factory method for creating an implementation object for naming contexts. /// If an existing naming context implementation is being rebuilt, the map diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h index 585b4a3f9fd..5bf39fd6f03 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h @@ -43,19 +43,19 @@ public: TAO_Transient_Bindings_Map (size_t hash_table_size); /// Destructor. - virtual ~TAO_Transient_Bindings_Map (void); + virtual ~TAO_Transient_Bindings_Map (); // = Accessors. /// Get a reference to the underlying hash map. - HASH_MAP &map (void); + HASH_MAP &map (); /// Return the size of the underlying hash table. - size_t total_size (void); + size_t total_size (); /// Return current number of entries (name bindings) in the /// underlying hash map. - virtual size_t current_size (void); + virtual size_t current_size (); // = Name bindings manipulation methods. @@ -137,7 +137,7 @@ public: = ACE_DEFAULT_MAP_SIZE); /// Destructor. - virtual ~TAO_Transient_Naming_Context (void); + virtual ~TAO_Transient_Naming_Context (); // = Utility methods. /** @@ -158,7 +158,7 @@ public: * same naming server in which the operation was invoked. The * context is not bound. */ - virtual CosNaming::NamingContext_ptr new_context (void); + virtual CosNaming::NamingContext_ptr new_context (); /** * Returns at most the requested number of bindings <how_many> in |