summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/orbsvcs/PortableGroup
diff options
context:
space:
mode:
authorKnut Petter Svendsen <knut@altuma.no>2022-09-13 22:57:39 +0200
committerKnut Petter Svendsen <knut@altuma.no>2022-09-13 22:57:39 +0200
commit3da59eac098c1ef9d2c98f2079185ff35c3b6105 (patch)
tree379c29e09bf55597fe6740cd163478cd1204a181 /TAO/orbsvcs/orbsvcs/PortableGroup
parentfe03724176dcfd20e0f9a6e493198469242be6b6 (diff)
downloadATCD-3da59eac098c1ef9d2c98f2079185ff35c3b6105.tar.gz
Remove obsolescent (void) in functions with no parameters
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/PortableGroup')
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h20
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h12
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.h10
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h8
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h10
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h8
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h14
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h8
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.h10
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.h8
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h14
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h8
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.h4
31 files changed, 96 insertions, 96 deletions
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.h b/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.h
index aae684c4044..2299c2da705 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.h
@@ -44,7 +44,7 @@ namespace TAO_PG
Fragments_Cleanup_Strategy (int bound);
/// The destructor
- virtual ~Fragments_Cleanup_Strategy (void);
+ virtual ~Fragments_Cleanup_Strategy ();
/// Sub-classes must implement these methods
virtual void cleanup (TAO_UIPMC_Mcast_Transport::Packets_Map &) = 0;
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h
index 151f99ebc1f..b921a67b2ec 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h
@@ -100,25 +100,25 @@ public:
#endif /* TAO_HAS_MINIMUM_POA == 0 */
- 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)
- 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);
@@ -148,7 +148,7 @@ public:
CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid);
- CORBA::OctetSeq *id (void);
+ CORBA::OctetSeq *id ();
// End standard POA interface methods.
@@ -161,10 +161,10 @@ public:
TAO_ORB_Core &orb_core,
TAO_Object_Adapter *object_adapter);
- virtual ~TAO_GOA (void);
+ virtual ~TAO_GOA ();
// Used to force the initialization of the code.
- static int Initializer (void);
+ static int Initializer ();
protected:
/// Template method for creating new POA's of this type.
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h
index 08026413a2a..3c44029c881 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h
@@ -28,7 +28,7 @@ namespace TAO
public:
/// Used to force the insertion of UIPMC_Factory in the service
/// configurator.
- static int Initializer (void);
+ static int Initializer ();
};
static int
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h
index d3f0b87766b..25f10cc839f 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h
@@ -35,10 +35,10 @@ class TAO_PortableGroup_Export TAO_PG_Default_Property_Validator
{
public:
/// Constructor.
- TAO_PG_Default_Property_Validator (void);
+ TAO_PG_Default_Property_Validator ();
/// Destructor
- virtual ~TAO_PG_Default_Property_Validator (void);
+ virtual ~TAO_PG_Default_Property_Validator ();
/// Validate the given properties. Throw an exception when the
/// first invalid property is encountered. The remaining properties
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
index 9b1b2dc7fb3..fae1f62b208 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
@@ -71,7 +71,7 @@ namespace TAO
PG_FactoryRegistry (const char * name = "FactoryRegistry");
/// virtual Destructor
- virtual ~PG_FactoryRegistry (void);
+ virtual ~PG_FactoryRegistry ();
/**
* Parse command line arguments.
@@ -97,7 +97,7 @@ namespace TAO
* Prepare to exit.
* @return zero for success; nonzero is process return code for failure.
*/
- int fini (void);
+ int fini ();
/**
* Processing to happen when the ORB's event loop is idle.
@@ -120,7 +120,7 @@ namespace TAO
////////////////////////////////
// override servant base methods
- virtual void _remove_ref (void);
+ virtual void _remove_ref ();
//////////////////
// CORBA interface
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h
index 1eaf3e2409c..691c142f1a4 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h
@@ -54,7 +54,7 @@ public:
TAO_PG_PropertyManager & property_manager);
/// Destructor.
- ~TAO_PG_GenericFactory (void);
+ ~TAO_PG_GenericFactory ();
/**
* @name TAO_LoadBalancer::GenericFactory methods
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h
index 92c6ece137b..52fe32a4306 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h
@@ -104,7 +104,7 @@ namespace TAO
* return all groups in the factory
*/
PortableGroup::ObjectGroups *
- all_groups (void);
+ all_groups ();
/**
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h
index eaa37bdee45..ad666863a4d 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h
@@ -53,10 +53,10 @@ public:
const PortableServer::ObjectId & oid);
/// Destructor.
- ~TAO_PG_Group_Guard (void);
+ ~TAO_PG_Group_Guard ();
/// Relinquish cleanup responsibility.
- void release (void);
+ void release ();
private:
/// Reference to the infrastructure TAO_PG_GenericFactory that
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h
index 6848d53a3e1..a78ea1a1c8b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h
@@ -47,10 +47,10 @@ class TAO_PortableGroup_Export TAO_PG_ObjectGroupManager
{
public:
/// Constructor.
- TAO_PG_ObjectGroupManager (void);
+ TAO_PG_ObjectGroupManager ();
/// Destructor.
- ~TAO_PG_ObjectGroupManager (void);
+ ~TAO_PG_ObjectGroupManager ();
/**
* @name PortableGroup::ObjectGroupManager methods
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h
index 292e338d13a..dd70623c5c5 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h
@@ -29,7 +29,7 @@ class TAO_PortableGroup_Export TAO_PG_Object_Adapter_Factory : public TAO_Object
{
public:
/// Constructor
- TAO_PG_Object_Adapter_Factory (void);
+ TAO_PG_Object_Adapter_Factory ();
/// Create adapter.
virtual TAO_Adapter *create (TAO_ORB_Core *orb_core);
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
index 90fb7f9e5dc..39951ceb8f2 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
@@ -229,7 +229,7 @@ namespace TAO
/**
* @@TODO DOC
*/
- virtual PortableGroup::Locations * locations_of_members (void);
+ virtual PortableGroup::Locations * locations_of_members ();
/**
* @@TODO DOC
@@ -241,12 +241,12 @@ namespace TAO
/**
* @@TODO DOC
*/
- virtual void initial_populate (void);
+ virtual void initial_populate ();
/**
* @@TODO DOC
*/
- virtual void minimum_populate (void);
+ virtual void minimum_populate ();
/**
@@ -263,21 +263,21 @@ namespace TAO
virtual void set_name (const char* group_name);
- virtual const char* get_name (void);
+ virtual const char* get_name ();
/////////////////////////
// Implementation methods
private:
int increment_version ();
- void distribute_iogr (void);
+ void distribute_iogr ();
void create_members (size_t count);
protected:
virtual PortableGroup::ObjectGroup_ptr add_member_to_iogr(CORBA::Object_ptr member);
- void clear_members_map (void);
+ void clear_members_map ();
/////////////////////////
// Forbidden methods
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.h
index fcd44cac08a..a1826ebc40b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.h
@@ -115,14 +115,14 @@ namespace TAO
const char * type_id,
const PortableGroup::Criteria & the_criteria);
- virtual PortableGroup::Locations * locations_of_members (void);
+ virtual PortableGroup::Locations * locations_of_members ();
virtual CORBA::Object_ptr get_member_reference (
const PortableGroup::Location & the_location);
- virtual void initial_populate (void);
+ virtual void initial_populate ();
- virtual void minimum_populate (void);
+ virtual void minimum_populate ();
virtual int has_member_at (const PortableGroup::Location & location );
@@ -130,7 +130,7 @@ namespace TAO
virtual void set_name (const char* group_name);
- virtual const char* get_name (void);
+ virtual const char* get_name ();
virtual PortableGroup::ObjectGroupId get_object_group_id () const;
@@ -165,7 +165,7 @@ namespace TAO
/**
* Signals that this context was updated.
*/
- virtual void state_written (void);
+ virtual void state_written ();
/**
* A callback invoked by the object group file guard
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h
index 2307a500f86..1db783c17dd 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h
@@ -92,7 +92,7 @@ namespace TAO
* resource leaks.
* @returns a newly allocated PortableGroup::Properties.
*/
- PortableGroup::Properties * get_default_properties (void);
+ PortableGroup::Properties * get_default_properties ();
/**
* Undefine default properties that appear in props.
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h
index 2491568dc71..acb8c6cfa95 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h
@@ -64,7 +64,7 @@ namespace TAO
/**
* constructor: empty set with no defaults.
*/
- PG_Property_Set (void);
+ PG_Property_Set ();
/**
* constructor
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h
index 21dd42c133d..84cb3013f4b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h
@@ -33,7 +33,7 @@ class TAO_PortableGroup_Export TAO_PG_Servant_Dispatcher
: public TAO_Servant_Dispatcher
{
public:
- virtual ~TAO_PG_Servant_Dispatcher (void);
+ virtual ~TAO_PG_Servant_Dispatcher ();
/// Pre_invoke remote request.
void pre_invoke_remote_request (TAO_Root_POA &poa,
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h
index b63011fe697..82934b24c9e 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h
@@ -63,16 +63,16 @@ public:
};
/// Default constructor.
- TAO_PortableGroup_Acceptor_Registry (void);
+ TAO_PortableGroup_Acceptor_Registry ();
/// Default destructor.
- ~TAO_PortableGroup_Acceptor_Registry (void);
+ ~TAO_PortableGroup_Acceptor_Registry ();
/// Open an acceptor based on a tagged profile.
void open (const TAO_Profile* profile, TAO_ORB_Core &orb_core);
/// Close all open acceptors.
- int close_all (void);
+ int close_all ();
typedef ACE_Unbounded_Queue<Entry> Acceptor_Registry;
typedef ACE_Unbounded_Queue_Iterator<Entry> Acceptor_Registry_Iterator;
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h
index fc8c91bc883..00054102207 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h
@@ -42,13 +42,13 @@ class TAO_PortableGroup_Export TAO_PortableGroup_Loader
{
public:
/// Constructor.
- TAO_PortableGroup_Loader (void);
+ TAO_PortableGroup_Loader ();
/// Initialize the PortableGroup loader hooks.
virtual int init (int argc, ACE_TCHAR *[]);
/// Used to force the initialization of the ORB code.
- static int Initializer (void);
+ static int Initializer ();
};
static int
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h
index 632e3c0aa14..ba9fb25eecd 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h
@@ -39,7 +39,7 @@ class TAO_PortableGroup_Export PortableGroup_Request_Dispatcher
public:
/// Destructor.
- virtual ~PortableGroup_Request_Dispatcher (void);
+ virtual ~PortableGroup_Request_Dispatcher ();
/**
* Dispatch a request.
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h
index 59657e554b9..a3cb206cd03 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h
@@ -85,7 +85,7 @@ public:
TAO_Portable_Group_Map ();
/// Destructor.
- ~TAO_Portable_Group_Map (void);
+ ~TAO_Portable_Group_Map ();
/// Add a GroupId->ObjectKey mapping to the map.
/// This function takes ownership of the memory pointed to be group_id
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h
index ab40b91faef..5ab7b942067 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h
@@ -50,14 +50,14 @@ public:
const char *listener_interfaces);
/// Destructor.
- ~TAO_UIPMC_Acceptor (void);
+ ~TAO_UIPMC_Acceptor ();
/// @@ Helper method for the implementation repository, should go
/// away
const ACE_INET_Addr& address () const;
/// Returns the array of endpoints in this acceptor
- const ACE_INET_Addr *endpoints (void);
+ const ACE_INET_Addr *endpoints ();
/**
* The TAO_Acceptor methods, check the documentation in
@@ -74,12 +74,12 @@ public:
int version_major,
int version_minor,
const char *options = 0);
- virtual int close (void);
+ virtual int close ();
virtual int create_profile (const TAO::ObjectKey &object_key,
TAO_MProfile &mprofile,
CORBA::Short priority);
virtual int is_collocated (const TAO_Endpoint *endpoint);
- virtual CORBA::ULong endpoint_count (void);
+ virtual CORBA::ULong endpoint_count ();
virtual int object_key (IOP::TaggedProfile &profile,
TAO::ObjectKey &key);
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h
index 20b45315b43..b95a2407a90 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h
@@ -59,7 +59,7 @@ public:
/// Destructor.
- ~TAO_UIPMC_Connection_Handler (void);
+ ~TAO_UIPMC_Connection_Handler ();
//@{
/** @name Connection Handler overloads
@@ -74,8 +74,8 @@ public:
//@{
/** @name Event Handler overloads
*/
- virtual int resume_handler (void);
- virtual int close_connection (void);
+ virtual int resume_handler ();
+ virtual int close_connection ();
virtual int handle_input (ACE_HANDLE);
virtual int handle_output (ACE_HANDLE);
virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
@@ -85,7 +85,7 @@ public:
//@}
/// Add ourselves to Cache.
- int add_transport_to_cache (void);
+ int add_transport_to_cache ();
/// Set Diff-Serv codepoint on outgoing packets.
int set_dscp_codepoint (CORBA::Boolean set_network_priority);
@@ -118,7 +118,7 @@ protected:
/**
* @name TAO_Connection Handler overloads
*/
- virtual int release_os_resources (void);
+ virtual int release_os_resources ();
virtual int handle_write_ready (const ACE_Time_Value *timeout);
//@}
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h
index 5b2371230ea..d19bc1c9f22 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h
@@ -40,15 +40,15 @@ class TAO_PortableGroup_Export TAO_UIPMC_Connector : public TAO_Connector
{
public:
/// Constructor.
- TAO_UIPMC_Connector (void);
+ TAO_UIPMC_Connector ();
/// Destructor.
- ~TAO_UIPMC_Connector (void);
+ ~TAO_UIPMC_Connector ();
// = The TAO_Connector methods, please check the documentation on
// Transport_Connector.h
int open (TAO_ORB_Core *orb_core);
- int close (void);
+ int close ();
TAO_Profile *create_profile (TAO_InputCDR& cdr);
virtual int check_prefix (const char *endpoint);
@@ -64,7 +64,7 @@ protected:
TAO_Transport_Descriptor_Interface &desc,
ACE_Time_Value *timeout = 0);
- virtual TAO_Profile * make_profile (void);
+ virtual TAO_Profile * make_profile ();
/// Cancel the passed cvs handler from the connector
virtual int cancel_svc_handler (TAO_Connection_Handler * svc_handler);
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h
index 914b80c6f61..9be6f5e6a1b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h
@@ -40,7 +40,7 @@ class TAO_PortableGroup_Export TAO_UIPMC_Endpoint : public TAO_Endpoint
{
public:
/// Default constructor.
- TAO_UIPMC_Endpoint (void);
+ TAO_UIPMC_Endpoint ();
/// Constructor.
TAO_UIPMC_Endpoint (const ACE_INET_Addr &addr);
@@ -50,23 +50,23 @@ public:
CORBA::UShort port);
/// Destructor.
- ~TAO_UIPMC_Endpoint (void);
+ ~TAO_UIPMC_Endpoint ();
// = Implementation of abstract TAO_Endpoint methods. See
// Endpoint.h for their documentation.
- virtual TAO_Endpoint *next (void);
+ virtual TAO_Endpoint *next ();
virtual int addr_to_string (char *buffer, size_t length);
/// Makes a copy of this TAO_Endpoint.
- virtual TAO_Endpoint *duplicate (void);
+ virtual TAO_Endpoint *duplicate ();
/// Return true if this endpoint is equivalent to @a other_endpoint. Two
/// endpoints are equivalent if their port and host are the same.
CORBA::Boolean is_equivalent (const TAO_Endpoint *other_endpoint);
/// Return a hash value for this object.
- CORBA::ULong hash (void);
+ CORBA::ULong hash ();
// Allocates memory and returns a copy of <this>
@@ -88,7 +88,7 @@ public:
/// Set the port number.
CORBA::UShort port (CORBA::UShort p); //@@ Frank - deprecate this.
- //TAO_UIPMC_Connection_Handler *&hint (void);
+ //TAO_UIPMC_Connection_Handler *&hint ();
// Access to our <hint_>.
/// Do we have a preferred local network interface set for this target?
bool is_preferred_network () const;
@@ -110,7 +110,7 @@ private:
void uint_ip_addr (ACE_UINT32 ip_addr);
/// Helper method to update the cached object address. @@ Vadym - deprecate this.
- void update_object_addr (void);
+ void update_object_addr ();
/// IP Multicast address. @@ Frank - deprecate this.
CORBA::Octet class_d_address_[4];
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h
index aa6b8127098..15e98f38630 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h
@@ -31,8 +31,8 @@ class TAO_Connector;
class TAO_PortableGroup_Export TAO_UIPMC_Protocol_Factory : public TAO_Protocol_Factory
{
public:
- TAO_UIPMC_Protocol_Factory (void);
- virtual ~TAO_UIPMC_Protocol_Factory (void);
+ TAO_UIPMC_Protocol_Factory ();
+ virtual ~TAO_UIPMC_Protocol_Factory ();
// = Service Configurator hooks.
/// Dynamic linking hook
@@ -49,8 +49,8 @@ public:
virtual char options_delimiter () const;
// = Check Protocol_Factory.h for a description of these methods.
- virtual TAO_Acceptor *make_acceptor (void);
- virtual TAO_Connector *make_connector (void);
+ virtual TAO_Acceptor *make_acceptor ();
+ virtual TAO_Connector *make_connector ();
virtual int requires_explicit_endpoint () const;
private:
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.h
index 6f5cdb32aa6..149e933831f 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.h
@@ -58,7 +58,7 @@ public:
TAO_UIPMC_Mcast_Connection_Handler (TAO_ORB_Core *orb_core);
/// Destructor.
- ~TAO_UIPMC_Mcast_Connection_Handler (void);
+ ~TAO_UIPMC_Mcast_Connection_Handler ();
//@{
/** @name Connection Handler overloads
@@ -73,8 +73,8 @@ public:
//@{
/** @name Event Handler overloads
*/
- virtual int resume_handler (void);
- virtual int close_connection (void);
+ virtual int resume_handler ();
+ virtual int close_connection ();
virtual int handle_input (ACE_HANDLE);
virtual int handle_output (ACE_HANDLE);
virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
@@ -84,7 +84,7 @@ public:
//@}
/// Add ourselves to Cache.
- int add_transport_to_cache (void);
+ int add_transport_to_cache ();
// UIPMC Additions - Begin
const ACE_INET_Addr &addr () const;
@@ -120,7 +120,7 @@ protected:
/**
* @name TAO_Connection Handler overloads
*/
- virtual int release_os_resources (void);
+ virtual int release_os_resources ();
virtual int handle_write_ready (const ACE_Time_Value *timeout);
//@}
};
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.h
index 5a2236c3e1d..8c0a23f2086 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.h
@@ -57,7 +57,7 @@ public:
TAO_ORB_Core *orb_core);
/// Default destructor.
- ~TAO_UIPMC_Mcast_Transport (void);
+ ~TAO_UIPMC_Mcast_Transport ();
/// Look for the documentation in Transport.h.
virtual int handle_input (TAO_Resume_Handle &rh,
@@ -69,8 +69,8 @@ protected:
* These are implementations of template methods declared by TAO_Transport.
*/
//@{
- virtual ACE_Event_Handler *event_handler_i (void);
- virtual TAO_Connection_Handler *connection_handler_i (void);
+ virtual ACE_Event_Handler *event_handler_i ();
+ virtual TAO_Connection_Handler *connection_handler_i ();
/// Write the complete Message_Block chain to the connection.
/// Shouldn't ever be called on the server side.
@@ -84,7 +84,7 @@ protected:
size_t,
ACE_Time_Value const *);
- virtual int register_handler (void);
+ virtual int register_handler ();
public:
/// @@TODO: These methods IMHO should have more meaningful
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h
index d15514aa6bd..5a5589dcba4 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h
@@ -54,7 +54,7 @@ public:
virtual char object_key_delimiter () const;
/// Return the char string prefix.
- static const char *prefix (void);
+ static const char *prefix ();
/// Profile constructor, default. Used when the profile contents
/// are not yet known or when it is being decoded from an IOR.
@@ -71,7 +71,7 @@ public:
TAO_ORB_Core *orb_core);
/// Destructor is to be called only through _decr_refcnt.
- ~TAO_UIPMC_Profile (void);
+ ~TAO_UIPMC_Profile ();
/// Template methods. Please see tao/Profile.h for documentation.
@@ -81,12 +81,12 @@ public:
virtual int decode (TAO_InputCDR &cdr);
virtual void parse_string (const char *string);
virtual char * to_string () const;
- virtual int encode_endpoints (void);
+ virtual int encode_endpoints ();
virtual void encodeAddressInfo (TAO_OutputCDR &stream) const;
- virtual TAO_Endpoint *endpoint (void);
+ virtual TAO_Endpoint *endpoint ();
virtual CORBA::ULong endpoint_count () const;
virtual CORBA::ULong hash (CORBA::ULong max);
- virtual IOP::TaggedProfile &create_tagged_profile (void);
+ virtual IOP::TaggedProfile &create_tagged_profile ();
virtual void request_target_specifier (
TAO_Target_Specification &target_spec,
TAO_Target_Specification::TAO_Target_Address r);
@@ -104,11 +104,11 @@ public:
protected:
/// Template methods, please see documentation in tao/Profile.h
virtual int decode_profile (TAO_InputCDR& cdr);
- virtual int decode_endpoints (void);
+ virtual int decode_endpoints ();
virtual void parse_string_i (const char *);
virtual void create_profile_body (TAO_OutputCDR &cdr) const;
virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile);
- virtual void update_cached_group_component (void);
+ virtual void update_cached_group_component ();
protected:
/**
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h
index 7f2e48da9de..000dc9cdc7c 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h
@@ -44,7 +44,7 @@ public:
TAO_ORB_Core *orb_core);
/// Default destructor.
- ~TAO_UIPMC_Transport (void);
+ ~TAO_UIPMC_Transport ();
protected:
/** @name Overridden Template Methods
@@ -52,8 +52,8 @@ protected:
* These are implementations of template methods declared by TAO_Transport.
*/
//@{
- virtual ACE_Event_Handler *event_handler_i (void);
- virtual TAO_Connection_Handler *connection_handler_i (void);
+ virtual ACE_Event_Handler *event_handler_i ();
+ virtual TAO_Connection_Handler *connection_handler_i ();
/// Write the complete Message_Block chain to the connection.
virtual ssize_t send (iovec *iov, int iovcnt,
@@ -65,7 +65,7 @@ protected:
size_t len,
ACE_Time_Value const *s = 0);
- virtual int register_handler (void);
+ virtual int register_handler ();
public:
/// @@TODO: These methods IMHO should have more meaningful
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h
index 2bf20d34d9d..b796f6b7c3d 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h
@@ -36,7 +36,7 @@ namespace TAO_PG
public:
UIPMC_Recv_Packet_Cleanup_Guard (TAO_UIPMC_Mcast_Transport *transport);
- ~UIPMC_Recv_Packet_Cleanup_Guard (void);
+ ~UIPMC_Recv_Packet_Cleanup_Guard ();
private:
TAO_UIPMC_Mcast_Transport *transport_;
@@ -51,9 +51,9 @@ namespace TAO_PG
{
public:
/// Constructs a new recv packet.
- UIPMC_Recv_Packet (void);
+ UIPMC_Recv_Packet ();
- ~UIPMC_Recv_Packet (void);
+ ~UIPMC_Recv_Packet ();
/// Adds a new fragment to the packet and if it fails marks the packet
/// as broken.
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h
index 93d8c76ca9e..cf9e22a29f3 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h
@@ -36,14 +36,14 @@ public:
TAO_UIPMC_Wait_Never (TAO_Transport *transport);
/// Destructor.
- virtual ~TAO_UIPMC_Wait_Never (void);
+ virtual ~TAO_UIPMC_Wait_Never ();
// = Documented in TAO_Wait_Strategy.
virtual int sending_request (TAO_ORB_Core *orb_core,
TAO_Message_Semantics msg_semantics);
virtual int wait (ACE_Time_Value *max_wait_time,
TAO_Synch_Reply_Dispatcher &rd);
- virtual int register_handler (void);
+ virtual int register_handler ();
virtual bool non_blocking () const;
virtual bool can_process_upcalls () const;
};
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.h b/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.h
index f872dd5c504..3f74cdeb86a 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.h
@@ -49,10 +49,10 @@ class TAO_PortableGroup_Export TAO_MIOP_Resource_Factory
{
public:
/// Constructor.
- TAO_MIOP_Resource_Factory (void);
+ TAO_MIOP_Resource_Factory ();
/// Destructor.
- virtual ~TAO_MIOP_Resource_Factory (void);
+ virtual ~TAO_MIOP_Resource_Factory ();
/**
* @name Service Configurator Hooks