diff options
Diffstat (limited to 'TAO/tests')
95 files changed, 287 insertions, 434 deletions
diff --git a/TAO/tests/AMI/client.cpp b/TAO/tests/AMI/client.cpp index 99c01fd4c5a..5c8268de7e6 100644 --- a/TAO/tests/AMI/client.cpp +++ b/TAO/tests/AMI/client.cpp @@ -86,7 +86,7 @@ public: Client (A::AMI_Test_ptr server, int niterations); /// The thread entry point. - virtual int svc (void); + virtual int svc (); // private: /// Var for the AMI_Test object. diff --git a/TAO/tests/Big_Reply/Big_Reply_i.h b/TAO/tests/Big_Reply/Big_Reply_i.h index 48dac729c0e..2139368bea6 100644 --- a/TAO/tests/Big_Reply/Big_Reply_i.h +++ b/TAO/tests/Big_Reply/Big_Reply_i.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- // =================================================================== /** * @file Big_Reply_i.h diff --git a/TAO/tests/Bug_1020_Basic_Regression/Server_Task.h b/TAO/tests/Bug_1020_Basic_Regression/Server_Task.h index ad5e6059fac..0207ca3ae3d 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/Server_Task.h +++ b/TAO/tests/Bug_1020_Basic_Regression/Server_Task.h @@ -23,7 +23,7 @@ public: size_t sz); /// The thread entry point. - virtual int svc (void); + virtual int svc (); private: /// Reference to the test interface diff --git a/TAO/tests/Bug_1020_Regression/ORB_Task.h b/TAO/tests/Bug_1020_Regression/ORB_Task.h index e8960166082..498f8bfd09a 100644 --- a/TAO/tests/Bug_1020_Regression/ORB_Task.h +++ b/TAO/tests/Bug_1020_Regression/ORB_Task.h @@ -13,7 +13,7 @@ class ORB_Task : public ACE_Task_Base public: ORB_Task(CORBA::ORB_ptr orb); - virtual int svc (void); + virtual int svc (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Bug_1361_Regression/ORB_Task.h b/TAO/tests/Bug_1361_Regression/ORB_Task.h index 9fe0d7ec260..a8fa63d7724 100644 --- a/TAO/tests/Bug_1361_Regression/ORB_Task.h +++ b/TAO/tests/Bug_1361_Regression/ORB_Task.h @@ -13,7 +13,7 @@ class ORB_Task : public ACE_Task_Base public: ORB_Task (CORBA::ORB_ptr orb); - virtual int svc (void); + virtual int svc (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.h b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.h index 3a899d5e404..94e88b01841 100644 --- a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.h +++ b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.h @@ -17,7 +17,7 @@ public: // Destructor... int shutdown (void); - virtual int svc (void); + virtual int svc (); virtual int put (Test::Echo_ptr echoptr); diff --git a/TAO/tests/Bug_1476_Regression/Sender_i.h b/TAO/tests/Bug_1476_Regression/Sender_i.h index bc2dc1bb460..575284c03be 100644 --- a/TAO/tests/Bug_1476_Regression/Sender_i.h +++ b/TAO/tests/Bug_1476_Regression/Sender_i.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- // =================================================================== /** * @file Sender_i.h @@ -27,16 +26,16 @@ public: Sender_i (CORBA::ORB_ptr orb); ///Destructor - virtual ~Sender_i (void); + virtual ~Sender_i (); // = The skeleton methods virtual void active_objects (CORBA::ULong ao); - virtual void send_ready_message (void); + virtual void send_ready_message (); - CORBA::ULong get_number_received (void) const; + CORBA::ULong get_number_received () const; - CORBA::ULong get_active_objects (void) const; + CORBA::ULong get_active_objects () const; private: /// Our local ORB ptr diff --git a/TAO/tests/Bug_2417_Regression/client.cpp b/TAO/tests/Bug_2417_Regression/client.cpp index e1f24e78eb7..afa4ffda9d5 100644 --- a/TAO/tests/Bug_2417_Regression/client.cpp +++ b/TAO/tests/Bug_2417_Regression/client.cpp @@ -36,7 +36,7 @@ class ThreadPool : public ACE_Task_Base { public: ThreadPool (CORBA::ORB_ptr orb); - virtual int svc (void); + virtual int svc (); private: CORBA::ORB_var orb_; }; diff --git a/TAO/tests/Bug_2417_Regression/publisher_impl.cpp b/TAO/tests/Bug_2417_Regression/publisher_impl.cpp index 7ab1cc23b6f..165830204e3 100644 --- a/TAO/tests/Bug_2417_Regression/publisher_impl.cpp +++ b/TAO/tests/Bug_2417_Regression/publisher_impl.cpp @@ -20,7 +20,7 @@ public: Worker(Publisher_impl * _owner); ~Worker(); void addSubscriber(Subscriber_ptr subscriber); - virtual int svc (void); + virtual int svc (); void terminate(); private: bool terminated; diff --git a/TAO/tests/Bug_2417_Regression/server.cpp b/TAO/tests/Bug_2417_Regression/server.cpp index 31b7f25a20a..246554ac593 100644 --- a/TAO/tests/Bug_2417_Regression/server.cpp +++ b/TAO/tests/Bug_2417_Regression/server.cpp @@ -36,7 +36,7 @@ class ThreadPool : public ACE_Task_Base { public: ThreadPool (CORBA::ORB_ptr orb); - virtual int svc (void); + virtual int svc (); private: CORBA::ORB_var orb_; }; diff --git a/TAO/tests/Bug_2494_Regression/server.cpp b/TAO/tests/Bug_2494_Regression/server.cpp index 6f7b23da911..710fdc31597 100644 --- a/TAO/tests/Bug_2494_Regression/server.cpp +++ b/TAO/tests/Bug_2494_Regression/server.cpp @@ -46,7 +46,7 @@ public: Worker (CORBA::ORB_ptr orb); // ctor - virtual int svc (void); + virtual int svc (); // The thread entry point. private: diff --git a/TAO/tests/Bug_2677_Regression/DllORB.h b/TAO/tests/Bug_2677_Regression/DllORB.h index d72946c0d96..0a18875b1ff 100644 --- a/TAO/tests/Bug_2677_Regression/DllORB.h +++ b/TAO/tests/Bug_2677_Regression/DllORB.h @@ -16,7 +16,7 @@ public: virtual int init (int argc, ACE_TCHAR *argv[]); - virtual int fini (void); + virtual int fini (); private: unsigned int failPrePostInit_; diff --git a/TAO/tests/Bug_2683_Regression/test_i.h b/TAO/tests/Bug_2683_Regression/test_i.h index 154e49b5a11..61ceecfc642 100644 --- a/TAO/tests/Bug_2683_Regression/test_i.h +++ b/TAO/tests/Bug_2683_Regression/test_i.h @@ -12,7 +12,7 @@ class ORB_Killer : public ACE_Task_Base public: /// Constructor ORB_Killer (CORBA::ORB_ptr orb); - virtual int svc (void); + virtual int svc (); private: CORBA::ORB_var orb_; }; diff --git a/TAO/tests/Bug_2805_Regression/client.cpp b/TAO/tests/Bug_2805_Regression/client.cpp index 8ffd6a12f67..a038b164012 100644 --- a/TAO/tests/Bug_2805_Regression/client.cpp +++ b/TAO/tests/Bug_2805_Regression/client.cpp @@ -80,7 +80,7 @@ public: Client (A::AMI_Test_ptr server, int niterations); /// The thread entry point. - virtual int svc (void); + virtual int svc (); // private: /// Var for the AMI_Test object. diff --git a/TAO/tests/Bug_2909_Regression/client.cpp b/TAO/tests/Bug_2909_Regression/client.cpp index a8f1a9f3f6b..9c9b02e239f 100644 --- a/TAO/tests/Bug_2909_Regression/client.cpp +++ b/TAO/tests/Bug_2909_Regression/client.cpp @@ -77,7 +77,7 @@ public: Client (A::AMI_Test_ptr server, int niterations); /// The thread entry point. - virtual int svc (void); + virtual int svc (); // private: /// Var for the AMI_Test object. diff --git a/TAO/tests/Bug_2936_Regression/PersistentPOA.h b/TAO/tests/Bug_2936_Regression/PersistentPOA.h index 239a115680c..1bd7c53e109 100644 --- a/TAO/tests/Bug_2936_Regression/PersistentPOA.h +++ b/TAO/tests/Bug_2936_Regression/PersistentPOA.h @@ -25,7 +25,7 @@ class bug2936_Export PersistentPoa protected: virtual int init (int argc, ACE_TCHAR *argv[]); - virtual int fini (void); + virtual int fini (); // private methods and instance variables private: diff --git a/TAO/tests/Bug_3108_Regression/client.cpp b/TAO/tests/Bug_3108_Regression/client.cpp index 259e7b0df70..3a34daed57b 100644 --- a/TAO/tests/Bug_3108_Regression/client.cpp +++ b/TAO/tests/Bug_3108_Regression/client.cpp @@ -48,7 +48,7 @@ public: // ctor Client (test_ptr server); - virtual int svc (void); + virtual int svc (); // The server. test_var server_; diff --git a/TAO/tests/Bug_3171_Regression/server.cpp b/TAO/tests/Bug_3171_Regression/server.cpp index de783b96f62..92c4e1532bb 100644 --- a/TAO/tests/Bug_3171_Regression/server.cpp +++ b/TAO/tests/Bug_3171_Regression/server.cpp @@ -58,7 +58,7 @@ class Worker : public ACE_Task_Base public: Worker (); - virtual int svc (void); + virtual int svc (); private: }; diff --git a/TAO/tests/Bug_3251_Regression/DllOrb.h b/TAO/tests/Bug_3251_Regression/DllOrb.h index a9541c0f930..de48025da89 100644 --- a/TAO/tests/Bug_3251_Regression/DllOrb.h +++ b/TAO/tests/Bug_3251_Regression/DllOrb.h @@ -20,9 +20,9 @@ public: virtual int init (int argc, ACE_TCHAR *argv[]); - virtual int fini (void); + virtual int fini (); - virtual int svc (void); + virtual int svc (); private: auto_ptr < ACE_Thread_Barrier > ma_barrier_; diff --git a/TAO/tests/Bug_3251_Regression/PersistentPoa.h b/TAO/tests/Bug_3251_Regression/PersistentPoa.h index 964b95fc886..cb43a653b55 100644 --- a/TAO/tests/Bug_3251_Regression/PersistentPoa.h +++ b/TAO/tests/Bug_3251_Regression/PersistentPoa.h @@ -23,7 +23,7 @@ class bug_3251_Export PersistentPoa: public ACE_Service_Object protected: virtual int init (int argc, ACE_TCHAR *argv[]); - virtual int fini (void); + virtual int fini (); // private methods and instance variables private: diff --git a/TAO/tests/Bug_3384_Regression/client.cpp b/TAO/tests/Bug_3384_Regression/client.cpp index ea37462912c..7b090db5fd2 100644 --- a/TAO/tests/Bug_3384_Regression/client.cpp +++ b/TAO/tests/Bug_3384_Regression/client.cpp @@ -45,7 +45,7 @@ public: Worker (CORBA::ORB_ptr orb); // ctor - virtual int svc (void); + virtual int svc (); // The thread entry point. private: diff --git a/TAO/tests/Bug_3499_Regression/DLL_Service.h b/TAO/tests/Bug_3499_Regression/DLL_Service.h index 0d4d77d40de..801ead231da 100644 --- a/TAO/tests/Bug_3499_Regression/DLL_Service.h +++ b/TAO/tests/Bug_3499_Regression/DLL_Service.h @@ -12,7 +12,7 @@ public: virtual int init (int , ACE_TCHAR * []); - virtual int fini (void); + virtual int fini (); /// This is only here for destruction purposes virtual void destroy (void); diff --git a/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.h b/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.h index 0571daa891c..f2d26f5d3db 100644 --- a/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.h +++ b/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.h @@ -14,7 +14,7 @@ public: virtual int init (int argc, ACE_TCHAR * argv []); - virtual int fini (void); + virtual int fini (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Bug_3531_Regression/client.cpp b/TAO/tests/Bug_3531_Regression/client.cpp index 966d2157fb8..37ed18ee226 100644 --- a/TAO/tests/Bug_3531_Regression/client.cpp +++ b/TAO/tests/Bug_3531_Regression/client.cpp @@ -90,7 +90,7 @@ public: Worker (CORBA::ORB_ptr orb); // ctor - virtual int svc (void); + virtual int svc (); // The thread entry point. private: diff --git a/TAO/tests/Bug_3531_Regression/server.cpp b/TAO/tests/Bug_3531_Regression/server.cpp index f21c3a1c74f..0988c258929 100644 --- a/TAO/tests/Bug_3531_Regression/server.cpp +++ b/TAO/tests/Bug_3531_Regression/server.cpp @@ -53,7 +53,7 @@ public: Worker (CORBA::ORB_ptr orb); // ctor - virtual int svc (void); + virtual int svc (); // The thread entry point. private: diff --git a/TAO/tests/Bug_3531b_Regression/server.cpp b/TAO/tests/Bug_3531b_Regression/server.cpp index 7b7637e06ca..2e9a80a1bfe 100644 --- a/TAO/tests/Bug_3531b_Regression/server.cpp +++ b/TAO/tests/Bug_3531b_Regression/server.cpp @@ -76,7 +76,7 @@ public: : shutdown_ (false) {} - virtual int svc (void); + virtual int svc (); virtual int close (u_long = 0); virtual int put (ACE_Message_Block * mblk, ACE_Time_Value * tv = 0); int process_cmd (void); diff --git a/TAO/tests/Bug_3542_Regression/DllOrb.h b/TAO/tests/Bug_3542_Regression/DllOrb.h index 616821e97cd..1030d5b022d 100644 --- a/TAO/tests/Bug_3542_Regression/DllOrb.h +++ b/TAO/tests/Bug_3542_Regression/DllOrb.h @@ -20,9 +20,9 @@ public: virtual int init (int argc, ACE_TCHAR *argv[]); - virtual int fini (void); + virtual int fini (); - virtual int svc (void); + virtual int svc (); private: auto_ptr < ACE_Thread_Barrier > ma_barrier_; diff --git a/TAO/tests/Bug_3567_Regression/client.cpp b/TAO/tests/Bug_3567_Regression/client.cpp index 3cc35b7b408..76acc2af742 100644 --- a/TAO/tests/Bug_3567_Regression/client.cpp +++ b/TAO/tests/Bug_3567_Regression/client.cpp @@ -71,7 +71,7 @@ public: Worker (CORBA::ORB_ptr orb); // ctor - virtual int svc (void); + virtual int svc (); // The thread entry point. private: @@ -96,7 +96,7 @@ public: ~Client () ; /// The thread entry point. - virtual int svc (void); + virtual int svc (); // private: /// Var for the AMI_Test object. diff --git a/TAO/tests/Bug_3567_Regression/server.cpp b/TAO/tests/Bug_3567_Regression/server.cpp index 70949ace98e..153766723e3 100644 --- a/TAO/tests/Bug_3567_Regression/server.cpp +++ b/TAO/tests/Bug_3567_Regression/server.cpp @@ -31,7 +31,7 @@ public: Worker (CORBA::ORB_ptr orb); // ctor - virtual int svc (void); + virtual int svc (); // The thread entry point. private: diff --git a/TAO/tests/Bug_3672_Regression/client.cpp b/TAO/tests/Bug_3672_Regression/client.cpp index 609f07b7754..88a2f8aa8dd 100644 --- a/TAO/tests/Bug_3672_Regression/client.cpp +++ b/TAO/tests/Bug_3672_Regression/client.cpp @@ -77,7 +77,7 @@ public: Client (A::AMI_Test_ptr server, int niterations, A::AMI_AMI_TestHandler_ptr handler); /// The thread entry point. - virtual int svc (void); + virtual int svc (); /// Set all members to nil void clear (); diff --git a/TAO/tests/Bug_3896_Regression/client.cpp b/TAO/tests/Bug_3896_Regression/client.cpp index 89330ba57a9..2f09cc510f4 100644 --- a/TAO/tests/Bug_3896_Regression/client.cpp +++ b/TAO/tests/Bug_3896_Regression/client.cpp @@ -42,7 +42,7 @@ class Client : public ACE_Task_Base public: Client (CORBA::ORB_ptr server); - virtual int svc (void); + virtual int svc (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h index 27aaab8a148..1d9c9cbc332 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h @@ -70,7 +70,6 @@ struct RefHelper struct CSD_TP_Test_Export AppHelper { - static void ref_to_file(CORBA::ORB_ptr orb, CORBA::Object_ptr obj, const ACE_TCHAR* filename); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h index a8307ab45b4..bbc8ba0cd90 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h @@ -7,29 +7,27 @@ class CSD_TP_Test_Export AppShutdown { - public: +public: + AppShutdown(); + virtual ~AppShutdown(); - AppShutdown(); - virtual ~AppShutdown(); + void init(CORBA::ORB_ptr orb, + unsigned num_clients); - void init(CORBA::ORB_ptr orb, - unsigned num_clients); + void wait (); - void wait (); + void client_done(); - void client_done(); + static AppShutdown* instance (); - static AppShutdown* instance (); +private: + CORBA::ORB_var orb_; + unsigned num_clients_; + ACE_Atomic_Op <TAO_SYNCH_MUTEX, unsigned> num_clients_shutdown_; - private: - CORBA::ORB_var orb_; - unsigned num_clients_; - ACE_Atomic_Op <TAO_SYNCH_MUTEX, unsigned> num_clients_shutdown_; - - OrbShutdownTask orb_shutdown_task_; + OrbShutdownTask orb_shutdown_task_; }; - #define TheAppShutdown AppShutdown::instance() #endif diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.h index 0a1ce4c76fc..8690c061ff8 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file ClientEngine.h @@ -18,19 +16,16 @@ #include "ace/Synch.h" #include "ace/CORBA_macros.h" - class ClientEngine; typedef TAO_Intrusive_Ref_Count_Handle<ClientEngine> ClientEngine_Handle; - class CSD_TP_Test_Export ClientEngine : public TAO_Intrusive_Ref_Count_Base<TAO_SYNCH_MUTEX> { - public: - - ClientEngine(); - virtual ~ClientEngine(); +public: + ClientEngine(); + virtual ~ClientEngine(); - virtual bool execute(void) = 0; + virtual bool execute(void) = 0; }; #endif diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.h index ed41fc51f39..29f046e1055 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file ClientTask.h @@ -17,30 +15,27 @@ #include "ace/Vector_T.h" #include "ace/Synch.h" - class CSD_TP_Test_Export ClientTask : public ACE_Task_Base { - public: - - ClientTask(bool shutdown_after_done = false); - virtual ~ClientTask(); - - void add_engine(ClientEngine* engine); +public: + ClientTask(bool shutdown_after_done = false); + virtual ~ClientTask(); - virtual int open(void* arg = 0); - virtual int svc(); - virtual int close(u_long); + void add_engine(ClientEngine* engine); - unsigned failure_count () const; + virtual int open(void* arg = 0); + virtual int svc(); + virtual int close(u_long); - private: + unsigned failure_count () const; - typedef ACE_Vector<ClientEngine_Handle> EngineVector; +private: + typedef ACE_Vector<ClientEngine_Handle> EngineVector; - TAO_SYNCH_MUTEX lock_; - EngineVector engines_; - bool shutdown_after_done_; - unsigned failure_count_; + TAO_SYNCH_MUTEX lock_; + EngineVector engines_; + bool shutdown_after_done_; + unsigned failure_count_; }; #endif diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.h index 36fff3dd607..c2d1b7a9d91 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.h @@ -6,18 +6,15 @@ class CSD_TP_Test_Export OrbRunner { - public: +public: + OrbRunner(CORBA::ORB_ptr orb, unsigned num_orb_threads = 1); + virtual ~OrbRunner(); - OrbRunner(CORBA::ORB_ptr orb, unsigned num_orb_threads = 1); - virtual ~OrbRunner(); + void run(); - void run(void); - - - private: - - CORBA::ORB_var orb_; - unsigned num_orb_threads_; +private: + CORBA::ORB_var orb_; + unsigned num_orb_threads_; }; #endif diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbShutdownTask.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbShutdownTask.cpp index e0932bd4c38..e97050db4a0 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbShutdownTask.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbShutdownTask.cpp @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OrbShutdownTask.cpp @@ -12,24 +10,16 @@ #include "ace/CORBA_macros.h" #include "ace/OS_NS_unistd.h" - OrbShutdownTask::OrbShutdownTask() { } - -OrbShutdownTask::~OrbShutdownTask() -{ -} - - void OrbShutdownTask::orb(CORBA::ORB_ptr orb) { this->orb_ = CORBA::ORB::_duplicate(orb); } - int OrbShutdownTask::open(void*) { diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbShutdownTask.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbShutdownTask.h index 9197b8083d5..94b63769026 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbShutdownTask.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbShutdownTask.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OrbShutdownTask.h @@ -15,24 +13,20 @@ #include "ace/Task.h" #include "tao/ORB.h" - class CSD_TP_Test_Export OrbShutdownTask : public ACE_Task_Base { - public: - - OrbShutdownTask(); - virtual ~OrbShutdownTask(); - - void orb(CORBA::ORB_ptr orb); - - virtual int open(void*); - virtual int svc(); - virtual int close(u_long); +public: + OrbShutdownTask(); + virtual ~OrbShutdownTask() = default; + void orb(CORBA::ORB_ptr orb); - private: + virtual int open(void*); + virtual int svc(); + virtual int close(u_long); - CORBA::ORB_var orb_; +private: + CORBA::ORB_var orb_; }; #endif diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbTask.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbTask.cpp index 758b9b2d833..097c6c1f494 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbTask.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbTask.cpp @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OrbTask.cpp @@ -13,19 +11,12 @@ namespace { enum { MAX_ORB_TASK_WORKER_THREADS = 20 }; } - OrbTask::OrbTask(CORBA::ORB_ptr orb, unsigned num_threads) : orb_(CORBA::ORB::_duplicate(orb)), num_threads_(num_threads) { } - -OrbTask::~OrbTask() -{ -} - - int OrbTask::open(void*) { @@ -87,7 +78,6 @@ OrbTask::svc() return 0; } - int OrbTask::close(u_long) { diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbTask.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbTask.h index dcacb31119d..e7d61ee0b18 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbTask.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbTask.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OrbTask.h @@ -17,20 +15,17 @@ class CSD_TP_Test_Export OrbTask : public ACE_Task_Base { - public: - - OrbTask(CORBA::ORB_ptr orb, unsigned num_threads = 1); - virtual ~OrbTask(); - - virtual int open(void* x = 0); - virtual int svc(); - virtual int close(u_long); - +public: + OrbTask(CORBA::ORB_ptr orb, unsigned num_threads = 1); + ~OrbTask() override = default; - private: + int open(void* x = 0) override; + int svc() override; + int close(u_long) override; - CORBA::ORB_var orb_; - unsigned num_threads_; +private: + CORBA::ORB_var orb_; + unsigned num_threads_; }; #endif diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h index 20607775fd3..f8670e65903 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h @@ -5,51 +5,47 @@ #include "tao/PortableServer/Servant_Base.h" #include "ace/Vector_T.h" - // The T type is a concrete servant type. template <class T> class ServantList { - public: - - typedef typename T::_stub_type T_stub; - typedef typename T::_stub_ptr_type T_stub_ptr; - typedef typename T::_stub_var_type T_stub_var; - - ServantList(); - ~ServantList(); - - /// Activate servant and output ior to a file. - void create_and_activate(unsigned num_servants, - CORBA::ORB_ptr orb, - PortableServer::POA_ptr poa, - const ACE_TCHAR* ior_fname_prefix); - - /// Activate servant and not output ior to a file. - void create_and_activate(unsigned num_servants, - PortableServer::POA_ptr poa); - - // Code not used and not working right now - possible future addition. - //void deactivate(PortableServer::POA_ptr poa); - - /// Get a (copy) of one of the object references (for a specific servant). - T_stub_ptr objref(unsigned index); - /// This doesn't return a copy. - T* servant(unsigned index); - - - private: - - struct ServantRecord - { - T* servant_; - PortableServer::ServantBase_var safe_servant_; - T_stub_var obj_; - }; - - typedef ACE_Vector<ServantRecord> ServantRecordVector; - - ServantRecordVector servant_records_; +public: + typedef typename T::_stub_type T_stub; + typedef typename T::_stub_ptr_type T_stub_ptr; + typedef typename T::_stub_var_type T_stub_var; + + ServantList(); + ~ServantList(); + + /// Activate servant and output ior to a file. + void create_and_activate(unsigned num_servants, + CORBA::ORB_ptr orb, + PortableServer::POA_ptr poa, + const ACE_TCHAR* ior_fname_prefix); + + /// Activate servant and not output ior to a file. + void create_and_activate(unsigned num_servants, + PortableServer::POA_ptr poa); + + // Code not used and not working right now - possible future addition. + //void deactivate(PortableServer::POA_ptr poa); + + /// Get a (copy) of one of the object references (for a specific servant). + T_stub_ptr objref(unsigned index); + /// This doesn't return a copy. + T* servant(unsigned index); + +private: + struct ServantRecord + { + T* servant_; + PortableServer::ServantBase_var safe_servant_; + T_stub_var obj_; + }; + + typedef ACE_Vector<ServantRecord> ServantRecordVector; + + ServantRecordVector servant_records_; }; diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.h index ae95c226bf7..b82edcb91e3 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.h @@ -7,17 +7,14 @@ #include "ace/Vector_T.h" #include "ace/SString.h" - typedef ACE_Vector< CORBA::Long, 1000 > LongVector; typedef ACE_Vector< ACE_CString, 1000 > StringVector; typedef ACE_Array< CORBA::Long > LongArray; - extern CSD_TP_Test_Export void swap ( CORBA::Long& x, CORBA::Long& y ); extern CSD_TP_Test_Export void sort ( LongVector & vector ); - #endif diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.h index 0fb4aaaaa9f..40b06e5ca2d 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.h @@ -8,25 +8,22 @@ class CSD_TP_Test_Export TestAppBase { - public: +public: + virtual ~TestAppBase(); - virtual ~TestAppBase(); + // Returns 0 for success, and -1 for failure. + int run (int argc, ACE_TCHAR *argv[]); - // Returns 0 for success, and -1 for failure. - int run (int argc, ACE_TCHAR *argv[]); + const char *name() const; - const char *name() const; +protected: + TestAppBase (const char* name); - protected: + // Returns -1 for failure, 0 for success + virtual int run_i (int argc, ACE_TCHAR *argv[]) = 0; - TestAppBase (const char* name); - - // Returns -1 for failure, 0 for success - virtual int run_i (int argc, ACE_TCHAR *argv[]) = 0; - - private: - - ACE_CString name_; +private: + ACE_CString name_; }; #endif diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.h index 1fc1cdec42a..0eb354a8060 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file Foo_A_ClientEngine.h @@ -19,20 +17,18 @@ class Foo_A_Statistics; class CSD_TP_Foo_A_Export Foo_A_ClientEngine : public ClientEngine { - public: - - Foo_A_ClientEngine(Foo_A_ptr obj, unsigned client_id = 0, bool collocated = false); - virtual ~Foo_A_ClientEngine(); - - virtual bool execute(void); +public: + Foo_A_ClientEngine(Foo_A_ptr obj, unsigned client_id = 0, bool collocated = false); + virtual ~Foo_A_ClientEngine(); - static void expected_results(Foo_A_Statistics& stats); + virtual bool execute(void); - private: + static void expected_results(Foo_A_Statistics& stats); - Foo_A_var obj_; - unsigned client_id_; - bool collocated_; +private: + Foo_A_var obj_; + unsigned client_id_; + bool collocated_; }; #endif diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.h index 5bf5c62d92c..72731110b59 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file Foo_B_ClientEngine.h @@ -20,26 +18,24 @@ class Callback_i; class CSD_TP_Foo_B_Export Foo_B_ClientEngine : public ClientEngine { - public: - - Foo_B_ClientEngine(Foo_B_ptr obj, - Callback_ptr callback, - unsigned client_id = 0, - bool collocated = false); - - virtual ~Foo_B_ClientEngine(); +public: + Foo_B_ClientEngine(Foo_B_ptr obj, + Callback_ptr callback, + unsigned client_id = 0, + bool collocated = false); - virtual bool execute(void); + virtual ~Foo_B_ClientEngine(); - static void expected_results(Foo_B_Statistics& stats); - static unsigned expected_callbacks (); + virtual bool execute(void); - private: + static void expected_results(Foo_B_Statistics& stats); + static unsigned expected_callbacks (); - Foo_B_var obj_; - Callback_var callback_; - unsigned client_id_; - bool collocated_; +private: + Foo_B_var obj_; + Callback_var callback_; + unsigned client_id_; + bool collocated_; }; #endif diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.h index b821b2c7230..e64bad650d9 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file Foo_B_SimpleClientEngine.h @@ -20,26 +18,24 @@ class Callback_i; class CSD_TP_Foo_B_Export Foo_B_SimpleClientEngine : public ClientEngine { - public: - - Foo_B_SimpleClientEngine(Foo_B_ptr obj, - Callback_ptr callback, - unsigned client_id = 0, - bool collocated = false); - - virtual ~Foo_B_SimpleClientEngine(); +public: + Foo_B_SimpleClientEngine(Foo_B_ptr obj, + Callback_ptr callback, + unsigned client_id = 0, + bool collocated = false); - virtual bool execute(void); + virtual ~Foo_B_SimpleClientEngine(); - static void expected_results(Foo_B_Statistics& stats); - static unsigned expected_callbacks (); + virtual bool execute(void); - private: + static void expected_results(Foo_B_Statistics& stats); + static unsigned expected_callbacks (); - Foo_B_var obj_; - Callback_var callback_; - unsigned client_id_; - bool collocated_; +private: + Foo_B_var obj_; + Callback_var callback_; + unsigned client_id_; + bool collocated_; }; #endif diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.h index 4e6e3f7d045..245c72fc54a 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file Foo_C_ClientEngine.h @@ -16,23 +14,20 @@ #include "Foo_CC.h" #include "Foo_C_Statistics.h" - class CSD_TP_Foo_C_Export Foo_C_ClientEngine : public ClientEngine { - public: - - Foo_C_ClientEngine(Foo_C_ptr obj, - unsigned client_id); - virtual ~Foo_C_ClientEngine(); - - virtual bool execute(void); +public: + Foo_C_ClientEngine(Foo_C_ptr obj, + unsigned client_id); + virtual ~Foo_C_ClientEngine(); - static void expected_results(Foo_C_Statistics& stats); + virtual bool execute(void); - private: + static void expected_results(Foo_C_Statistics& stats); - Foo_C_var obj_; - unsigned client_id_; +private: + Foo_C_var obj_; + unsigned client_id_; }; #endif diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.h index f3b9d19cb7e..6ef663ec30a 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file Foo_C_Custom_ClientEngine.h @@ -15,26 +13,22 @@ #include "ClientEngine.h" #include "Foo_C_Custom_Proxy.h" - class CSD_TP_Foo_C_Export Foo_C_Custom_ClientEngine : public ClientEngine { - public: - - Foo_C_Custom_ClientEngine(Foo_C_i* servant, - Foo_C_ptr objref, - TAO::CSD::TP_Strategy* strategy, - unsigned client_id); - virtual ~Foo_C_Custom_ClientEngine(); - - virtual bool execute(void); - - static void expected_results(Foo_C_Statistics& stats); +public: + Foo_C_Custom_ClientEngine(Foo_C_i* servant, + Foo_C_ptr objref, + TAO::CSD::TP_Strategy* strategy, + unsigned client_id); + virtual ~Foo_C_Custom_ClientEngine(); + virtual bool execute(void); - private: + static void expected_results(Foo_C_Statistics& stats); - Foo_C_Custom_Proxy proxy_; - unsigned client_id_; +private: + Foo_C_Custom_Proxy proxy_; + unsigned client_id_; }; #endif diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.h index 674e454a4ca..3c82dd0f15a 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file Foo_C_Custom_Proxy.h @@ -16,11 +14,9 @@ #include "Foo_C_i.h" #include "tao/CSD_ThreadPool/CSD_TP_Strategy.h" - class CSD_TP_Foo_C_Export Foo_C_Custom_Proxy { public: - Foo_C_Custom_Proxy(Foo_C_i* servant, Foo_C_ptr objref, TAO::CSD::TP_Strategy* strategy); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.h index a107ad34528..27475bb4a78 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file Foo_C_cust_op1.h @@ -20,24 +18,21 @@ class Foo_C_i; class Foo_C_cust_op1; typedef TAO_Intrusive_Ref_Count_Handle<Foo_C_cust_op1> Foo_C_cust_op1_Handle; - class CSD_TP_Foo_C_Export Foo_C_cust_op1 : public TAO::CSD::TP_Custom_Request_Operation { - public: - - Foo_C_cust_op1(Foo_C_i* servant); - virtual ~Foo_C_cust_op1(); - - void result(void); +public: + Foo_C_cust_op1(Foo_C_i* servant); + virtual ~Foo_C_cust_op1(); + void result(void); - protected: - virtual void execute_i(); - virtual void cancel_i(); +protected: + virtual void execute_i(); + virtual void cancel_i(); - private: - bool cancelled_; - Foo_C_i* servant_; +private: + bool cancelled_; + Foo_C_i* servant_; }; #endif diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.h index 25e6cf28f1a..f26caa26e60 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file Foo_C_cust_op2.h @@ -20,29 +18,22 @@ class Foo_C_i; class Foo_C_cust_op2; typedef TAO_Intrusive_Ref_Count_Handle<Foo_C_cust_op2> Foo_C_cust_op2_Handle; - class CSD_TP_Foo_C_Export Foo_C_cust_op2 : public TAO::CSD::TP_Custom_Request_Operation { - public: - - Foo_C_cust_op2(Foo_C_i* servant, long arg); - virtual ~Foo_C_cust_op2(); - - void result(void); - - - protected: - - virtual void execute_i(); - virtual void cancel_i(); - +public: + Foo_C_cust_op2(Foo_C_i* servant, long arg); + virtual ~Foo_C_cust_op2(); - private: + void result(void); - long arg_; - bool cancelled_; +protected: + virtual void execute_i(); + virtual void cancel_i(); - Foo_C_i* servant_; +private: + long arg_; + bool cancelled_; + Foo_C_i* servant_; }; #endif diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.h index cd52e184a6a..61a034eb086 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file Foo_C_cust_op3.h @@ -20,30 +18,23 @@ class Foo_C_i; class Foo_C_cust_op3; typedef TAO_Intrusive_Ref_Count_Handle<Foo_C_cust_op3> Foo_C_cust_op3_Handle; - class CSD_TP_Foo_C_Export Foo_C_cust_op3 : public TAO::CSD::TP_Custom_Request_Operation { - public: - - Foo_C_cust_op3(Foo_C_i* servant, long arg); - virtual ~Foo_C_cust_op3(); - - long result(void); - - - protected: - - virtual void execute_i(); - virtual void cancel_i(); - +public: + Foo_C_cust_op3(Foo_C_i* servant, long arg); + virtual ~Foo_C_cust_op3(); - private: + long result(void); - long arg_; - long result_; - bool cancelled_; +protected: + virtual void execute_i(); + virtual void cancel_i(); - Foo_C_i* servant_; +private: + long arg_; + long result_; + bool cancelled_; + Foo_C_i* servant_; }; #endif diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op4.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op4.h index 8d5c42757a0..d97852d798e 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op4.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op4.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file Foo_C_cust_op4.h @@ -20,26 +18,19 @@ class Foo_C_i; class Foo_C_cust_op4; typedef TAO_Intrusive_Ref_Count_Handle<Foo_C_cust_op4> Foo_C_cust_op4_Handle; - class CSD_TP_Foo_C_Export Foo_C_cust_op4 : public TAO::CSD::TP_Custom_Request_Operation { - public: - - Foo_C_cust_op4(Foo_C_i* servant, long arg); - virtual ~Foo_C_cust_op4(); - - - protected: - - virtual void execute_i(); - virtual void cancel_i(); - - - private: +public: + Foo_C_cust_op4(Foo_C_i* servant, long arg); + virtual ~Foo_C_cust_op4(); - long arg_; +protected: + virtual void execute_i(); + virtual void cancel_i(); - Foo_C_i* servant_; +private: + long arg_; + Foo_C_i* servant_; }; #endif diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.h index 333fe40d057..8a3c0159bbd 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file Foo_C_cust_op5.h @@ -20,29 +18,22 @@ class Foo_C_i; class Foo_C_cust_op5; typedef TAO_Intrusive_Ref_Count_Handle<Foo_C_cust_op5> Foo_C_cust_op5_Handle; - class CSD_TP_Foo_C_Export Foo_C_cust_op5 : public TAO::CSD::TP_Custom_Request_Operation { - public: - - Foo_C_cust_op5(Foo_C_i* servant); - virtual ~Foo_C_cust_op5(); - - void result(void); - - - protected: - - virtual void execute_i(); - virtual void cancel_i(); - +public: + Foo_C_cust_op5(Foo_C_i* servant); + virtual ~Foo_C_cust_op5(); - private: + void result(void); - bool exception_; - bool cancelled_; +protected: + virtual void execute_i(); + virtual void cancel_i(); - Foo_C_i* servant_; +private: + bool exception_; + bool cancelled_; + Foo_C_i* servant_; }; #endif diff --git a/TAO/tests/DLL_ORB/Test_Client_Module.h b/TAO/tests/DLL_ORB/Test_Client_Module.h index 8cb2d44ee61..d2757f8128e 100644 --- a/TAO/tests/DLL_ORB/Test_Client_Module.h +++ b/TAO/tests/DLL_ORB/Test_Client_Module.h @@ -41,10 +41,10 @@ public: virtual int init (int argc, ACE_TCHAR *argv[]); /// Terminates object when dynamic unlinking occurs. - virtual int fini (void); + virtual int fini (); /// Run by a daemon thread to handle deferred processing. - virtual int svc (void); + virtual int svc (); private: diff --git a/TAO/tests/DLL_ORB/Test_Server_Module.h b/TAO/tests/DLL_ORB/Test_Server_Module.h index da65a59ce27..a741049c4ad 100644 --- a/TAO/tests/DLL_ORB/Test_Server_Module.h +++ b/TAO/tests/DLL_ORB/Test_Server_Module.h @@ -41,10 +41,10 @@ public: virtual int init (int argc, ACE_TCHAR *argv[]); /// Terminates object when dynamic unlinking occurs. - virtual int fini (void); + virtual int fini (); /// Run by a daemon thread to handle deferred processing. - virtual int svc (void); + virtual int svc (); virtual ~Test_Server_Module (void); diff --git a/TAO/tests/Dynamic_TP/ORB_ThreadPool/Client.cpp b/TAO/tests/Dynamic_TP/ORB_ThreadPool/Client.cpp index 689c1446bd9..edb2562a0ac 100644 --- a/TAO/tests/Dynamic_TP/ORB_ThreadPool/Client.cpp +++ b/TAO/tests/Dynamic_TP/ORB_ThreadPool/Client.cpp @@ -7,7 +7,7 @@ class MT_Requestor : public virtual ACE_Task_Base public: MT_Requestor (Test::Middle_ptr m, CORBA::Short sec); - virtual int svc (void); + virtual int svc (); private: Test::Middle_var middle_; CORBA::Short seconds_; diff --git a/TAO/tests/File_IO/server.cpp b/TAO/tests/File_IO/server.cpp index ce2a1d2b538..5cf199a84e1 100644 --- a/TAO/tests/File_IO/server.cpp +++ b/TAO/tests/File_IO/server.cpp @@ -22,7 +22,7 @@ public: Worker (CORBA::ORB_ptr orb); // ctor - virtual int svc (void); + virtual int svc (); // The thread entry point. private: diff --git a/TAO/tests/ForwardOnceUponException/client.cpp b/TAO/tests/ForwardOnceUponException/client.cpp index 2a0223db73b..3ebab564f83 100644 --- a/TAO/tests/ForwardOnceUponException/client.cpp +++ b/TAO/tests/ForwardOnceUponException/client.cpp @@ -71,7 +71,7 @@ public: // Constructor // = The Task_Base methods - virtual int svc (void); + virtual int svc (); // Caught any exception ? int received_ex_kind () const; diff --git a/TAO/tests/ForwardUponObjectNotExist/client.cpp b/TAO/tests/ForwardUponObjectNotExist/client.cpp index fe0f24b6c99..ba98b629398 100644 --- a/TAO/tests/ForwardUponObjectNotExist/client.cpp +++ b/TAO/tests/ForwardUponObjectNotExist/client.cpp @@ -60,7 +60,7 @@ public: /// The actual implementation of the test virtual void run_test (void); - virtual int svc (void); + virtual int svc (); /// Caught OBJECT_NOT_EXIST exception ? bool got_object_not_exist () const; diff --git a/TAO/tests/Forwarding/client.cpp b/TAO/tests/Forwarding/client.cpp index d4037881831..c14cc58d77f 100644 --- a/TAO/tests/Forwarding/client.cpp +++ b/TAO/tests/Forwarding/client.cpp @@ -52,7 +52,7 @@ public: // The actual implementation of the test // = The Task_Base methods - virtual int svc (void); + virtual int svc (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/LongUpcalls/AMI_Manager.h b/TAO/tests/LongUpcalls/AMI_Manager.h index 79e9f35ef42..c5ec6f15903 100644 --- a/TAO/tests/LongUpcalls/AMI_Manager.h +++ b/TAO/tests/LongUpcalls/AMI_Manager.h @@ -32,7 +32,7 @@ public: CORBA::Long milliseconds, CORBA::ORB_ptr orb); - virtual int svc (void); + virtual int svc (); // The service method private: diff --git a/TAO/tests/LongUpcalls/Manager.h b/TAO/tests/LongUpcalls/Manager.h index de0b40dd319..8a8c31a580d 100644 --- a/TAO/tests/LongUpcalls/Manager.h +++ b/TAO/tests/LongUpcalls/Manager.h @@ -32,7 +32,7 @@ public: Test::Controller_ptr controller, CORBA::Long milliseconds); - virtual int svc (void); + virtual int svc (); // The service method private: diff --git a/TAO/tests/MT_Client/client.cpp b/TAO/tests/MT_Client/client.cpp index c4aef141512..dae352c2acb 100644 --- a/TAO/tests/MT_Client/client.cpp +++ b/TAO/tests/MT_Client/client.cpp @@ -56,7 +56,7 @@ public: Client (Simple_Server_ptr server, int niterations); // ctor - virtual int svc (void); + virtual int svc (); // The thread entry point. private: diff --git a/TAO/tests/MT_Client/orb_creation.cpp b/TAO/tests/MT_Client/orb_creation.cpp index 44ed8590e59..6bbea2da704 100644 --- a/TAO/tests/MT_Client/orb_creation.cpp +++ b/TAO/tests/MT_Client/orb_creation.cpp @@ -53,7 +53,7 @@ public: const char* ior); // ctor - virtual int svc (void); + virtual int svc (); // The thread entry point. private: diff --git a/TAO/tests/MT_NoUpcall_Client_Leader/chatter.h b/TAO/tests/MT_NoUpcall_Client_Leader/chatter.h index a9e31f4e0f5..224dd5a4e2d 100644 --- a/TAO/tests/MT_NoUpcall_Client_Leader/chatter.h +++ b/TAO/tests/MT_NoUpcall_Client_Leader/chatter.h @@ -10,7 +10,7 @@ class Chatter : public Worker { public: Chatter (CORBA::ORB_ptr orb, const ACE_TCHAR *ior, ACE_Condition<ACE_Mutex>& cond); - virtual int svc (void); + virtual int svc (); int farewell (); long nrequests (void); long nreplies (void); diff --git a/TAO/tests/MT_NoUpcall_Client_Leader/worker.h b/TAO/tests/MT_NoUpcall_Client_Leader/worker.h index aa0244e0e21..4e75ff3f4c3 100644 --- a/TAO/tests/MT_NoUpcall_Client_Leader/worker.h +++ b/TAO/tests/MT_NoUpcall_Client_Leader/worker.h @@ -17,7 +17,7 @@ public: Worker (CORBA::ORB_ptr orb); // ctor - virtual int svc (void); + virtual int svc (); // The thread entry point. public: diff --git a/TAO/tests/MT_Server/server.cpp b/TAO/tests/MT_Server/server.cpp index 82620993a6c..99e4e4bbf33 100644 --- a/TAO/tests/MT_Server/server.cpp +++ b/TAO/tests/MT_Server/server.cpp @@ -47,7 +47,7 @@ public: Worker (CORBA::ORB_ptr orb); // ctor - virtual int svc (void); + virtual int svc (); // The thread entry point. private: diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/client.cpp b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/client.cpp index bc53d39ce43..33cdd24ad25 100644 --- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/client.cpp +++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/client.cpp @@ -55,7 +55,7 @@ public: // Constructor // = The Task_Base methods - virtual int svc (void); + virtual int svc (); // Caught any exception ? int received_ex_kind () const; diff --git a/TAO/tests/Muxed_GIOP_Versions/client.cpp b/TAO/tests/Muxed_GIOP_Versions/client.cpp index 413809511ec..d8e2e8da78f 100644 --- a/TAO/tests/Muxed_GIOP_Versions/client.cpp +++ b/TAO/tests/Muxed_GIOP_Versions/client.cpp @@ -60,7 +60,7 @@ public: Client (Simple_Server_ptr server, int niterations); // ctor - virtual int svc (void); + virtual int svc (); // The thread entry point. private: diff --git a/TAO/tests/Muxed_GIOP_Versions/server.cpp b/TAO/tests/Muxed_GIOP_Versions/server.cpp index 2e4dce3e7dd..3b27ff909d3 100644 --- a/TAO/tests/Muxed_GIOP_Versions/server.cpp +++ b/TAO/tests/Muxed_GIOP_Versions/server.cpp @@ -69,7 +69,7 @@ public: Worker (CORBA::ORB_ptr orb); /// The thread entry point. - virtual int svc (void); + virtual int svc (); private: @@ -90,7 +90,7 @@ public: SelfClient (CORBA::ORB_ptr orb, Simple_Server_ptr server, int niterations); // ctor - virtual int svc (void); + virtual int svc (); // The thread entry point. private: diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.h b/TAO/tests/NestedUpcall/MT_Client_Test/client.h index b4d9a8c861f..9f7bc2f1d3f 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/client.h +++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.h @@ -92,7 +92,7 @@ class MT_Client_Task : public ACE_Task<ACE_SYNCH> public: MT_Client_Task (int argc, ACE_TCHAR **argv, int client_number); - virtual int svc (void); + virtual int svc (); private: MT_Client mT_Client_; diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h index cc1e4357e95..35d8be77869 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h +++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h @@ -107,7 +107,7 @@ public: ACE_TCHAR **argv, TAO_ORB_Manager* orb_manager_ptr); - virtual int svc (void); + virtual int svc (); private: MT_Server mT_Server_; diff --git a/TAO/tests/No_Server_MT_Connect_Test/client.cpp b/TAO/tests/No_Server_MT_Connect_Test/client.cpp index 6649dbc7b0c..80cf170c64d 100644 --- a/TAO/tests/No_Server_MT_Connect_Test/client.cpp +++ b/TAO/tests/No_Server_MT_Connect_Test/client.cpp @@ -57,7 +57,7 @@ public: /// The thread entry point. - virtual int svc (void); + virtual int svc (); private: Simple_Server_var server_; diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h index 9b051ef7ac7..883d6c025a5 100644 --- a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h +++ b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h @@ -32,11 +32,11 @@ class DllOrb_Export DllOrb virtual int init (int argc, ACE_TCHAR *argv[]); - virtual int fini (void); + virtual int fini (); // protected types and methods protected: - virtual int svc (void); + virtual int svc (); // private methods and instance variables private: diff --git a/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.h b/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.h index 2bf3b6eaa44..535972f7a3e 100644 --- a/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.h +++ b/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.h @@ -41,14 +41,14 @@ public: virtual int init (int argc, ACE_TCHAR *argv[]); /// Terminates object when dynamic unlinking occurs. - virtual int fini (void); + virtual int fini (); /// Run by a daemon thread. /** * Each thread will invoke the Service Configurator via this * method unless the object is the "FINAL" object. */ - virtual int svc (void); + virtual int svc (); private: diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h index bb952ea1fca..4adee3cc6d7 100644 --- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h +++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h @@ -91,7 +91,7 @@ public: * Each thread will invoke the Service Configurator via this * method unless the object is the "FINAL" object. */ - virtual int svc (void); + virtual int svc (); private: signed char is_server_; diff --git a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h index 1a1d8e044bb..111bf6147bd 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h +++ b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- // =================================================================== /** * @file Receiver_i.h diff --git a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h index 658ca912400..2c045a7d8bd 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h +++ b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- // =================================================================== /** * @file Sender_i.h diff --git a/TAO/tests/POA/Loader/Servant_Activator.h b/TAO/tests/POA/Loader/Servant_Activator.h index 6ce4840c4d7..34adf6ee19f 100644 --- a/TAO/tests/POA/Loader/Servant_Activator.h +++ b/TAO/tests/POA/Loader/Servant_Activator.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file Servant_Activator.h diff --git a/TAO/tests/POA/Loader/Servant_Locator.h b/TAO/tests/POA/Loader/Servant_Locator.h index f0402a0cfa5..8f76acb75c3 100644 --- a/TAO/tests/POA/Loader/Servant_Locator.h +++ b/TAO/tests/POA/Loader/Servant_Locator.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file Servant_Locator.h diff --git a/TAO/tests/POA/Loader/Server_Manager.h b/TAO/tests/POA/Loader/Server_Manager.h index 3e12ee9aafb..69901de9fef 100644 --- a/TAO/tests/POA/Loader/Server_Manager.h +++ b/TAO/tests/POA/Loader/Server_Manager.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file Server_Manager.h diff --git a/TAO/tests/POA/On_Demand_Loading/Servant_Activator.h b/TAO/tests/POA/On_Demand_Loading/Servant_Activator.h index ebddca4b829..dc8d8ae3ab2 100644 --- a/TAO/tests/POA/On_Demand_Loading/Servant_Activator.h +++ b/TAO/tests/POA/On_Demand_Loading/Servant_Activator.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file Servant_Activator.h @@ -12,7 +10,6 @@ */ //============================================================================= - #ifndef SERVANT_ACTIVATOR_H #define SERVANT_ACTIVATOR_H diff --git a/TAO/tests/POA/On_Demand_Loading/Servant_Locator.h b/TAO/tests/POA/On_Demand_Loading/Servant_Locator.h index 5bda0398a77..7b744cafac9 100644 --- a/TAO/tests/POA/On_Demand_Loading/Servant_Locator.h +++ b/TAO/tests/POA/On_Demand_Loading/Servant_Locator.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file Servant_Locator.h @@ -11,7 +9,6 @@ */ //============================================================================= - #ifndef SERVANT_LOCATOR_H #define SERVANT_LOCATOR_H diff --git a/TAO/tests/POA/On_Demand_Loading/Servant_Manager.h b/TAO/tests/POA/On_Demand_Loading/Servant_Manager.h index 9049c080f36..16aa0032bc6 100644 --- a/TAO/tests/POA/On_Demand_Loading/Servant_Manager.h +++ b/TAO/tests/POA/On_Demand_Loading/Servant_Manager.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file Servant_Manager.h @@ -10,7 +8,6 @@ */ //============================================================================= - #ifndef SERVANT_MANAGER_H #define SERVANT_MANAGER_H diff --git a/TAO/tests/POA/On_Demand_Loading/Server_Manager.h b/TAO/tests/POA/On_Demand_Loading/Server_Manager.h index 612160fc3d8..da3c669f680 100644 --- a/TAO/tests/POA/On_Demand_Loading/Server_Manager.h +++ b/TAO/tests/POA/On_Demand_Loading/Server_Manager.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file Server_Manager.h @@ -10,7 +8,6 @@ */ //============================================================================= - #ifndef SERVER_MANAGER_H #define SERVER_MANAGER_H diff --git a/TAO/tests/Policies/Manipulation.cpp b/TAO/tests/Policies/Manipulation.cpp index 84f75a7854c..1c8ca3a272f 100644 --- a/TAO/tests/Policies/Manipulation.cpp +++ b/TAO/tests/Policies/Manipulation.cpp @@ -54,7 +54,7 @@ public: int niterations); /// The thread entry point. - virtual int svc (void); + virtual int svc (); private: void perform_iteration (unsigned int *seed, diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp index 48a6b0f905a..bdb4d340acc 100644 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp @@ -28,7 +28,7 @@ public: ACE_Barrier *barrier); // Constructor. - virtual int svc (void); + virtual int svc (); // Do work. private: diff --git a/TAO/tests/RTScheduling/Current/Thread_Task.h b/TAO/tests/RTScheduling/Current/Thread_Task.h index 2138e9e7731..eca0f6da253 100644 --- a/TAO/tests/RTScheduling/Current/Thread_Task.h +++ b/TAO/tests/RTScheduling/Current/Thread_Task.h @@ -17,7 +17,7 @@ class Thread_Task : public ACE_Task <ACE_SYNCH> protected: /// task svc - virtual int svc (void); + virtual int svc (); private: CORBA::ORB_var orb_; RTScheduling::Current_var current_; diff --git a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.h b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.h index c59f70affb6..55c479befcb 100644 --- a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.h +++ b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.h @@ -15,7 +15,7 @@ class Thread_Task : public ACE_Task <ACE_SYNCH> protected: /// task svc - virtual int svc (void); + virtual int svc (); private: CORBA::ORB_var orb_; RTScheduling::Current_var current_; diff --git a/TAO/tests/TransportCurrent/Framework/client.cpp b/TAO/tests/TransportCurrent/Framework/client.cpp index 6e8737a30f1..f91eea955d1 100644 --- a/TAO/tests/TransportCurrent/Framework/client.cpp +++ b/TAO/tests/TransportCurrent/Framework/client.cpp @@ -69,7 +69,7 @@ class Worker : public ACE_Task_Base { public: Worker (Test::Transport::CurrentTest_ptr server, int niterations, int use_dii_too); - virtual int svc (void); + virtual int svc (); private: // The server. diff --git a/TAO/tests/TransportCurrent/Framework/server.cpp b/TAO/tests/TransportCurrent/Framework/server.cpp index bf76a489a6d..b14bd1caec4 100644 --- a/TAO/tests/TransportCurrent/Framework/server.cpp +++ b/TAO/tests/TransportCurrent/Framework/server.cpp @@ -55,7 +55,7 @@ class Worker : public ACE_Task_Base { public: Worker (CORBA::ORB_ptr); - virtual int svc (void); + virtual int svc (); private: // The ORB diff --git a/TAO/tests/TransportCurrent/IIOP/client.cpp b/TAO/tests/TransportCurrent/IIOP/client.cpp index 0ac7557c468..843baeaeb6f 100644 --- a/TAO/tests/TransportCurrent/IIOP/client.cpp +++ b/TAO/tests/TransportCurrent/IIOP/client.cpp @@ -69,7 +69,7 @@ class Worker : public ACE_Task_Base { public: Worker (Test::Transport::CurrentTest_ptr server, int niterations, int use_dii_too); - virtual int svc (void); + virtual int svc (); private: // The server. diff --git a/TAO/tests/TransportCurrent/IIOP/server.cpp b/TAO/tests/TransportCurrent/IIOP/server.cpp index 122086f513d..b7c0e769a28 100644 --- a/TAO/tests/TransportCurrent/IIOP/server.cpp +++ b/TAO/tests/TransportCurrent/IIOP/server.cpp @@ -54,7 +54,7 @@ class Worker : public ACE_Task_Base { public: Worker (CORBA::ORB_ptr); - virtual int svc (void); + virtual int svc (); private: // The ORB diff --git a/TAO/tests/Two_Objects/worker.h b/TAO/tests/Two_Objects/worker.h index 1df842862e9..2e50f9c9982 100644 --- a/TAO/tests/Two_Objects/worker.h +++ b/TAO/tests/Two_Objects/worker.h @@ -15,7 +15,7 @@ public: Worker (CORBA::ORB_ptr orb); // The thread entry point. - virtual int svc (void); + virtual int svc (); private: |