summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/orbsvcs
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/orbsvcs')
-rw-r--r--TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h2
25 files changed, 26 insertions, 28 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
index 51ef58e254e..693e026a7a2 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
@@ -43,7 +43,7 @@ public:
/// Called by the Service Configurator framework to remove the
/// Event Service. Defined in <ace/Service_Config.h>
- virtual int fini (void);
+ virtual int fini ();
/// This function call initializes the Concurrency Service given a
/// reference to the ORB and the command line parameters.
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h
index ec12e35c7ff..84403d50e75 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h
@@ -54,7 +54,7 @@ public:
// = The Service_Object entry points
virtual int init (int argc, ACE_TCHAR* argv[]);
- virtual int fini (void);
+ virtual int fini ();
// = The CEC_Factory methods
virtual TAO_CEC_Dispatching*
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
index e1cbff169a7..5561bbca026 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
@@ -47,7 +47,7 @@ public:
TAO_CEC_Dispatching_Task (ACE_Thread_Manager* thr_manager = 0);
/// Process the events in the queue.
- virtual int svc (void);
+ virtual int svc ();
virtual void push (TAO_CEC_ProxyPushSupplier *proxy,
CORBA::Any& event);
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
index 13444dc750a..f4019a5c167 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
@@ -48,7 +48,7 @@ public:
* @name Derived from ACE_Service_Object
*/
virtual int init (int argc, ACE_TCHAR *argv[]);
- virtual int fini (void);
+ virtual int fini ();
//@}
//@{
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h
index 43404454e53..11dc877cd2a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h
@@ -45,7 +45,7 @@ public:
// = The Service_Object entry points
virtual int init (int argc, ACE_TCHAR* argv[]);
- virtual int fini (void);
+ virtual int fini ();
// = The EC_Factory methods
virtual TAO_EC_Dispatching*
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h
index c6b46663e7b..d643250f735 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h
@@ -45,7 +45,7 @@ public:
// Decorated methods...
virtual int init (int argc, ACE_TCHAR* argv[]);
- virtual int fini (void);
+ virtual int fini ();
virtual TAO_EC_Dispatching*
create_dispatching (TAO_EC_Event_Channel_Base*);
virtual void
@@ -94,9 +94,9 @@ public:
create_proxy_push_supplier_collection (TAO_EC_Event_Channel_Base*);
virtual void
destroy_proxy_push_supplier_collection (TAO_EC_ProxyPushSupplier_Collection*);
- virtual ACE_Lock* create_consumer_lock (void);
+ virtual ACE_Lock* create_consumer_lock ();
virtual void destroy_consumer_lock (ACE_Lock*);
- virtual ACE_Lock* create_supplier_lock (void);
+ virtual ACE_Lock* create_supplier_lock ();
virtual void destroy_supplier_lock (ACE_Lock*);
virtual TAO_EC_ConsumerControl*
create_consumer_control (TAO_EC_Event_Channel_Base*);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.h
index 27c71fcd87d..c2968bd2821 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.h
@@ -40,7 +40,7 @@ public:
// = The Service_Object entry points
virtual int init (int argc, ACE_TCHAR* argv[]);
- virtual int fini (void);
+ virtual int fini ();
// = The EC_Factory methods
virtual TAO_EC_Dispatching*
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h
index f6ff0028ff1..9ffd20d4a17 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h
@@ -48,7 +48,7 @@ public:
PortableServer::POA_ptr poa() { return poa_.in(); }
CORBA::ORB_ptr orb() { return orb_.in();}
private:
- virtual int svc (void);
+ virtual int svc ();
CORBA::ORB_var orb_;
PortableServer::POA_var root_poa_;
PortableServer::POA_var poa_;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h
index 6cdb867f44a..a7e4893d49e 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h
@@ -48,7 +48,7 @@ protected:
public:
// ctor
ReactorTask();
- virtual int svc (void);
+ virtual int svc ();
ACE_Reactor reactor_;
};
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp
index 278cae08786..dc935b3e89e 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp
@@ -1,4 +1,3 @@
-// This may look like C, but it's really -*- C++ -*-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/HTIOP/HTIOP_Acceptor.h"
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h
index 7d78bb653ea..e887ac94801 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h
@@ -82,7 +82,7 @@ namespace TAO
/// Only used when the handler is turned into an active object by
/// calling <activate>. This serves as the event loop in such cases.
- virtual int svc (void);
+ virtual int svc ();
#endif /* 0 */
//@{
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp
index 5d17a0de8d2..624829ef98d 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp
@@ -1,4 +1,3 @@
-// This may look like C, but it's really -*- C++ -*-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/HTIOP/HTIOP_Profile.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h
index 84938c8c2eb..de362c0991a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h
@@ -43,7 +43,7 @@ public:
// Called by the Service Configurator framework to remove the
// Event Service. Defined in <ace/Service_Config.h>
- virtual int fini (void);
+ virtual int fini ();
// This function call initializes the IFR Service given a reference to the
// ORB and the command line parameters.
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h
index e21f4aa30cc..1786f209790 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h
@@ -44,7 +44,7 @@ public:
virtual int init (int argc, ACE_TCHAR *argv[]);
/// Terminates object when dynamic unlinking occurs.
- virtual int fini (void);
+ virtual int fini ();
protected:
/// Register the LB_ClientComponent's ORBInitializer.
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h
index 0e1b4ec591c..1212d11d11d 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h
@@ -45,7 +45,7 @@ public:
virtual int init (int argc, ACE_TCHAR *argv[]);
/// Terminates object when dynamic unlinking occurs.
- virtual int fini (void);
+ virtual int fini ();
protected:
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h
index b527dae317e..c49ca438234 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h
@@ -47,7 +47,7 @@ public:
TAO_LB_LoadManager (int ping_timeout,
int ping_interval);
- virtual int svc (void);
+ virtual int svc ();
/**
* @name CosLoadBalancing::LoadManager Methods
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 b812777263b..d27ce41225c 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.h
@@ -72,7 +72,7 @@ public:
virtual ~TAO_FT_Naming_Replication_Manager(void);
- virtual int svc (void);
+ virtual int svc ();
virtual int handle_exception (ACE_HANDLE );
void stop (void);
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h
index 791a0fed973..fe6358773f2 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h
@@ -127,7 +127,7 @@ public:
/// Destroy the child POAs created in @c init_with_orb,
/// @c init_naming_manager_with_orb, and
/// @c init_replication_manager_with_orb
- virtual int fini (void);
+ virtual int fini ();
/// Destructor.
virtual ~TAO_FT_Naming_Server (void);
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h
index a3f78e6f5a1..131eb19f4a6 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h
@@ -44,7 +44,7 @@ public:
/// Called by the Service Configurator framework to remove the
/// Event Service. Defined in <ace/Service_Config.h>
- virtual int fini (void);
+ virtual int fini ();
/// This function call initializes the Naming Service given a reference to the
/// ORB and the command line parameters.
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h
index 8ca13ba9870..860828f8187 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h
@@ -125,7 +125,7 @@ public:
virtual int init_with_orb (int argc, ACE_TCHAR *argv [], CORBA::ORB_ptr orb);
/// Destroy the child POA created in @c init_with_orb
- virtual int fini (void);
+ virtual int fini ();
/// Destructor.
virtual ~TAO_Naming_Server (void);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
index aa5c73a5f16..f1c0781b4c8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
@@ -44,7 +44,7 @@ public:
/// Init the service from driver
virtual void init_service (CORBA::ORB_ptr orb);
- virtual int fini (void);
+ virtual int fini ();
/// separate dispatching orb init
virtual void init_service2 (CORBA::ORB_ptr orb, CORBA::ORB_ptr dispatching_orb);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h
index c57f50caac8..60c9758d246 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h
@@ -25,7 +25,7 @@ public:
TAO_MonitorManager (void);
virtual int init (int argc, ACE_TCHAR* argv[]);
- virtual int fini (void);
+ virtual int fini ();
/// Start the ORB task which includes initializtion of the ORB,
/// creation of the monitor servant and activation.
@@ -44,7 +44,7 @@ private:
{
public:
ORBTask (void);
- virtual int svc (void);
+ virtual int svc ();
TAO_SYNCH_MUTEX mutex_;
ACE_ARGV_T<ACE_TCHAR> argv_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h
index c556b0dd5e7..58fe638e208 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h
@@ -75,7 +75,7 @@ public:
protected:
/// Task svc
- virtual int svc (void);
+ virtual int svc ();
private:
/// Release
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h
index 7c243fea89c..62739cd5965 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h
@@ -55,7 +55,7 @@ public:
/// destructor...
virtual ~TAO_Notify_validate_client_Task (void);
- virtual int svc (void);
+ virtual int svc ();
void shutdown (void);
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
index 6006017b4be..a3a5c9c7ca1 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
@@ -44,7 +44,7 @@ public:
/// Called by the Service Configurator framework to remove the
/// Event Service. Defined in <ace/Service_Config.h>
- virtual int fini (void);
+ virtual int fini ();
/// Run the Trading Service
int run (void);