diff options
Diffstat (limited to 'TAO/examples')
37 files changed, 115 insertions, 256 deletions
diff --git a/TAO/examples/AMH/Sink_Server/Client_Task.h b/TAO/examples/AMH/Sink_Server/Client_Task.h index 91dd1b5082d..1eff57f05a6 100644 --- a/TAO/examples/AMH/Sink_Server/Client_Task.h +++ b/TAO/examples/AMH/Sink_Server/Client_Task.h @@ -38,7 +38,7 @@ public: protected: /// The service method - virtual int svc (void); + virtual int svc (); private: /// Print Statistics diff --git a/TAO/examples/AMI/FL_Callback/Peer_i.h b/TAO/examples/AMI/FL_Callback/Peer_i.h index c9563cf4279..77c00e57588 100644 --- a/TAO/examples/AMI/FL_Callback/Peer_i.h +++ b/TAO/examples/AMI/FL_Callback/Peer_i.h @@ -92,7 +92,7 @@ public: CORBA::Long id); /// The thread entry point - virtual int svc (void); + virtual int svc (); private: /// The peers diff --git a/TAO/examples/AMI/FL_Callback/peer.cpp b/TAO/examples/AMI/FL_Callback/peer.cpp index 878d1c9d740..18a884e8675 100644 --- a/TAO/examples/AMI/FL_Callback/peer.cpp +++ b/TAO/examples/AMI/FL_Callback/peer.cpp @@ -56,7 +56,7 @@ public: Worker (CORBA::ORB_ptr orb); /// The thread entry point. - virtual int svc (void); + virtual int svc (); private: /// The orb diff --git a/TAO/examples/CSD_Strategy/ThreadPool/OrbShutdownTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool/OrbShutdownTask.cpp index 1e8b5944313..ee579c9e4c1 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool/OrbShutdownTask.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool/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*) { @@ -47,7 +37,6 @@ OrbShutdownTask::open(void*) return 0; } - int OrbShutdownTask::svc() { @@ -67,7 +56,6 @@ OrbShutdownTask::svc() return 0; } - int OrbShutdownTask::close(u_long) { diff --git a/TAO/examples/CSD_Strategy/ThreadPool/OrbShutdownTask.h b/TAO/examples/CSD_Strategy/ThreadPool/OrbShutdownTask.h index 6f0bd826751..d0939b46191 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool/OrbShutdownTask.h +++ b/TAO/examples/CSD_Strategy/ThreadPool/OrbShutdownTask.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OrbShutdownTask.h @@ -14,24 +12,21 @@ #include "ace/Task.h" #include "tao/ORB.h" - class OrbShutdownTask : public ACE_Task_Base { - public: - - OrbShutdownTask(); - virtual ~OrbShutdownTask(); - - void orb(CORBA::ORB_ptr orb); +public: + OrbShutdownTask(); + virtual ~OrbShutdownTask() = default; - virtual int open(void*); - virtual int svc(); - virtual int close(u_long); + void orb(CORBA::ORB_ptr orb); + virtual int open(void*); + virtual int svc(); + virtual int close(u_long); - private: - CORBA::ORB_var orb_; +private: + CORBA::ORB_var orb_; }; typedef ACE_Singleton<OrbShutdownTask, TAO_SYNCH_MUTEX> TheOrbShutdownTask; diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/OrbShutdownTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/OrbShutdownTask.cpp index 1e8b5944313..0aaadc3344b 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool2/OrbShutdownTask.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool2/OrbShutdownTask.cpp @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OrbShutdownTask.cpp @@ -12,24 +10,17 @@ #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*) { @@ -47,7 +38,6 @@ OrbShutdownTask::open(void*) return 0; } - int OrbShutdownTask::svc() { @@ -67,7 +57,6 @@ OrbShutdownTask::svc() return 0; } - int OrbShutdownTask::close(u_long) { diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/OrbShutdownTask.h b/TAO/examples/CSD_Strategy/ThreadPool2/OrbShutdownTask.h index 6f0bd826751..d0939b46191 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool2/OrbShutdownTask.h +++ b/TAO/examples/CSD_Strategy/ThreadPool2/OrbShutdownTask.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OrbShutdownTask.h @@ -14,24 +12,21 @@ #include "ace/Task.h" #include "tao/ORB.h" - class OrbShutdownTask : public ACE_Task_Base { - public: - - OrbShutdownTask(); - virtual ~OrbShutdownTask(); - - void orb(CORBA::ORB_ptr orb); +public: + OrbShutdownTask(); + virtual ~OrbShutdownTask() = default; - virtual int open(void*); - virtual int svc(); - virtual int close(u_long); + void orb(CORBA::ORB_ptr orb); + virtual int open(void*); + virtual int svc(); + virtual int close(u_long); - private: - CORBA::ORB_var orb_; +private: + CORBA::ORB_var orb_; }; typedef ACE_Singleton<OrbShutdownTask, TAO_SYNCH_MUTEX> TheOrbShutdownTask; diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/OrbShutdownTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/OrbShutdownTask.cpp index 1e8b5944313..f1c523a37ab 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool3/OrbShutdownTask.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool3/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*) { @@ -47,7 +37,6 @@ OrbShutdownTask::open(void*) return 0; } - int OrbShutdownTask::svc() { diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/OrbShutdownTask.h b/TAO/examples/CSD_Strategy/ThreadPool3/OrbShutdownTask.h index 6f0bd826751..704d3b37e0c 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool3/OrbShutdownTask.h +++ b/TAO/examples/CSD_Strategy/ThreadPool3/OrbShutdownTask.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OrbShutdownTask.h @@ -14,24 +12,20 @@ #include "ace/Task.h" #include "tao/ORB.h" - class 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_; }; typedef ACE_Singleton<OrbShutdownTask, TAO_SYNCH_MUTEX> TheOrbShutdownTask; diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/OrbTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/OrbTask.cpp index d304e57961e..55855088190 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool3/OrbTask.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool3/OrbTask.cpp @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OrbTask.cpp @@ -12,19 +10,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*) { diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/OrbTask.h b/TAO/examples/CSD_Strategy/ThreadPool3/OrbTask.h index 039da12da9f..52bc5b9c8a5 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool3/OrbTask.h +++ b/TAO/examples/CSD_Strategy/ThreadPool3/OrbTask.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OrbTask.h @@ -16,20 +14,18 @@ class 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); + virtual ~OrbTask() = default; + virtual int open(void* x = 0); + virtual int svc(); + virtual int close(u_long); - private: - CORBA::ORB_var orb_; - unsigned num_threads_; +private: + CORBA::ORB_var orb_; + unsigned num_threads_; }; #endif diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp index bf87b4a618e..e3a52473c9d 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file ClientTask.cpp @@ -18,12 +16,10 @@ ClientTask::ClientTask(Foo_ptr foo, { } - ClientTask::~ClientTask() { } - int ClientTask::open(void*) { diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.h b/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.h index a8385e4d1d1..e361cc1c606 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.h +++ b/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file ClientTask.h @@ -17,20 +15,19 @@ class ClientTask : public ACE_Task_Base { - public: - - ClientTask(Foo_ptr foo, - Callback_ptr callback); +public: + ClientTask(Foo_ptr foo, + Callback_ptr callback); - virtual ~ClientTask(); + virtual ~ClientTask(); - virtual int open(void* x = 0); - virtual int svc(); - virtual int close(u_long); + virtual int open(void* x = 0); + virtual int svc(); + virtual int close(u_long); - private: - Foo_var foo_; - Callback_var callback_; +private: + Foo_var foo_; + Callback_var callback_; }; #endif diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/OrbShutdownTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/OrbShutdownTask.cpp index 1e8b5944313..7b7fbdedde1 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool4/OrbShutdownTask.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool4/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/examples/CSD_Strategy/ThreadPool4/OrbShutdownTask.h b/TAO/examples/CSD_Strategy/ThreadPool4/OrbShutdownTask.h index 6f0bd826751..704d3b37e0c 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool4/OrbShutdownTask.h +++ b/TAO/examples/CSD_Strategy/ThreadPool4/OrbShutdownTask.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OrbShutdownTask.h @@ -14,24 +12,20 @@ #include "ace/Task.h" #include "tao/ORB.h" - class 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_; }; typedef ACE_Singleton<OrbShutdownTask, TAO_SYNCH_MUTEX> TheOrbShutdownTask; diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp index 85c0ef4d00d..c64376c9403 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file ClientTask.cpp @@ -23,12 +21,10 @@ ClientTask::ClientTask(CORBA::ORB_ptr orb, { } - ClientTask::~ClientTask() { } - int ClientTask::open(void*) { diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.h b/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.h index ec19ef9a1bb..f92336b0c26 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.h +++ b/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file ClientTask.h @@ -17,26 +15,25 @@ class ClientTask : public ACE_Task_Base { - public: - - ClientTask(CORBA::ORB_ptr orb, - Foo_ptr foo, - Callback_ptr callback, - bool collocated = false); +public: + ClientTask(CORBA::ORB_ptr orb, + Foo_ptr foo, + Callback_ptr callback, + bool collocated = false); - virtual ~ClientTask(); + virtual ~ClientTask(); - virtual int open(void* x = 0); - virtual int svc(); - virtual int close(u_long); + virtual int open(void* x = 0); + virtual int svc(); + virtual int close(u_long); - private: - bool validate_connection (); +private: + bool validate_connection (); - CORBA::ORB_var orb_; - Foo_var foo_; - Callback_var callback_; - bool collocated_; + CORBA::ORB_var orb_; + Foo_var foo_; + Callback_var callback_; + bool collocated_; }; #endif diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/OrbShutdownTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/OrbShutdownTask.cpp index 1e8b5944313..ee579c9e4c1 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/OrbShutdownTask.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool5/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*) { @@ -47,7 +37,6 @@ OrbShutdownTask::open(void*) return 0; } - int OrbShutdownTask::svc() { @@ -67,7 +56,6 @@ OrbShutdownTask::svc() return 0; } - int OrbShutdownTask::close(u_long) { diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/OrbShutdownTask.h b/TAO/examples/CSD_Strategy/ThreadPool5/OrbShutdownTask.h index 6f0bd826751..d0939b46191 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/OrbShutdownTask.h +++ b/TAO/examples/CSD_Strategy/ThreadPool5/OrbShutdownTask.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OrbShutdownTask.h @@ -14,24 +12,21 @@ #include "ace/Task.h" #include "tao/ORB.h" - class OrbShutdownTask : public ACE_Task_Base { - public: - - OrbShutdownTask(); - virtual ~OrbShutdownTask(); - - void orb(CORBA::ORB_ptr orb); +public: + OrbShutdownTask(); + virtual ~OrbShutdownTask() = default; - virtual int open(void*); - virtual int svc(); - virtual int close(u_long); + void orb(CORBA::ORB_ptr orb); + virtual int open(void*); + virtual int svc(); + virtual int close(u_long); - private: - CORBA::ORB_var orb_; +private: + CORBA::ORB_var orb_; }; typedef ACE_Singleton<OrbShutdownTask, TAO_SYNCH_MUTEX> TheOrbShutdownTask; diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/OrbTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/OrbTask.cpp index 1b178b8f561..45d2074cbf3 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/OrbTask.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool5/OrbTask.cpp @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OrbTask.cpp @@ -12,7 +10,6 @@ namespace { enum { MAX_ORB_TASK_WORKER_THREADS = 20 }; } - OrbTask::OrbTask(CORBA::ORB_ptr orb, unsigned num_threads) : num_threads_(num_threads) { @@ -20,11 +17,6 @@ OrbTask::OrbTask(CORBA::ORB_ptr orb, unsigned num_threads) } -OrbTask::~OrbTask() -{ -} - - int OrbTask::open(void*) { diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/OrbTask.h b/TAO/examples/CSD_Strategy/ThreadPool5/OrbTask.h index 039da12da9f..e7d808302f2 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/OrbTask.h +++ b/TAO/examples/CSD_Strategy/ThreadPool5/OrbTask.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OrbTask.h @@ -16,20 +14,17 @@ class 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); + virtual ~OrbTask() = default; - private: + virtual int open(void* x = 0); + virtual int svc(); + virtual int close(u_long); - CORBA::ORB_var orb_; - unsigned num_threads_; +private: + CORBA::ORB_var orb_; + unsigned num_threads_; }; #endif diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/OrbShutdownTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/OrbShutdownTask.cpp index 1e8b5944313..ee579c9e4c1 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool6/OrbShutdownTask.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool6/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*) { @@ -47,7 +37,6 @@ OrbShutdownTask::open(void*) return 0; } - int OrbShutdownTask::svc() { @@ -67,7 +56,6 @@ OrbShutdownTask::svc() return 0; } - int OrbShutdownTask::close(u_long) { diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/OrbShutdownTask.h b/TAO/examples/CSD_Strategy/ThreadPool6/OrbShutdownTask.h index 6f0bd826751..704d3b37e0c 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool6/OrbShutdownTask.h +++ b/TAO/examples/CSD_Strategy/ThreadPool6/OrbShutdownTask.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OrbShutdownTask.h @@ -14,24 +12,20 @@ #include "ace/Task.h" #include "tao/ORB.h" - class 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_; }; typedef ACE_Singleton<OrbShutdownTask, TAO_SYNCH_MUTEX> TheOrbShutdownTask; diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp index 01cf271ab38..4ac44575a48 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp @@ -29,7 +29,7 @@ public: // int sleep_time); // ctor - virtual int svc (void); + virtual int svc (); // The thread entry point. private: diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp index 5c508a5d761..857c842cd0d 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp @@ -64,7 +64,7 @@ public: Worker (CORBA::ORB_ptr orb); // ctor - virtual int svc (void); + virtual int svc (); // The thread entry point. private: diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp index f4c54c08fff..c71fa10bf11 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp @@ -29,7 +29,7 @@ public: // int sleep_time); // ctor - virtual int svc (void); + virtual int svc (); // The thread entry point. private: diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp index 202ee9489a3..810c7326f99 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp @@ -64,7 +64,7 @@ public: Worker (CORBA::ORB_ptr orb); // ctor - virtual int svc (void); + virtual int svc (); // The thread entry point. private: diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp index d6e1f1ae4c3..625164d0927 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp @@ -32,7 +32,7 @@ public: // int sleep_time); // ctor - virtual int svc (void); + virtual int svc (); // The thread entry point. private: diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp index f28ae234f5d..4e2feec4fd5 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp @@ -64,7 +64,7 @@ public: Worker (CORBA::ORB_ptr orb); // ctor - virtual int svc (void); + virtual int svc (); // The thread entry point. private: diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp index ae03fd9da69..d4caa0614df 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp @@ -71,7 +71,7 @@ public: virtual ~Client (void) {}; /// The thread entry point. - virtual int svc (void); + virtual int svc (); private: /// The server. diff --git a/TAO/examples/Quoter/client.h b/TAO/examples/Quoter/client.h index d5bae5c6332..9a58d890955 100644 --- a/TAO/examples/Quoter/client.h +++ b/TAO/examples/Quoter/client.h @@ -103,7 +103,7 @@ class Quoter_Task : public ACE_Task<ACE_SYNCH> public: Quoter_Task (int argc, ACE_TCHAR **argv); - virtual int svc (void); + virtual int svc (); private: Quoter_Client quoter_client; diff --git a/TAO/examples/RTCORBA/Activity/Builder.h b/TAO/examples/RTCORBA/Activity/Builder.h index 0af3a9fb16d..8b0db2a892f 100644 --- a/TAO/examples/RTCORBA/Activity/Builder.h +++ b/TAO/examples/RTCORBA/Activity/Builder.h @@ -40,7 +40,7 @@ class Builder : public ACE_Service_Object /// = Service_Object virtual method overloads. virtual int init (int argc, ACE_TCHAR *argv[]); - virtual int fini (void); + virtual int fini (); /// = List access int poa_list (POA_LIST& poa_list); diff --git a/TAO/examples/RTCORBA/Activity/Thread_Task.h b/TAO/examples/RTCORBA/Activity/Thread_Task.h index 13563a579f6..1538a8acd0e 100644 --- a/TAO/examples/RTCORBA/Activity/Thread_Task.h +++ b/TAO/examples/RTCORBA/Activity/Thread_Task.h @@ -36,7 +36,7 @@ class Thread_Task : public Periodic_Task protected: /// task svc - virtual int svc (void); + virtual int svc (); }; #endif /* THREAD_TASK_H */ diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.h b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.h index 59616b7a4fb..34a0323310d 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.h +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.h @@ -37,7 +37,7 @@ class DT_Test :public ACE_Task <ACE_SYNCH> protected: /// task svc - virtual int svc (void); + virtual int svc (); diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/test.h b/TAO/examples/RTScheduling/MIF_Scheduler/test.h index 18b914937ce..f308c4df398 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/test.h +++ b/TAO/examples/RTScheduling/MIF_Scheduler/test.h @@ -30,7 +30,7 @@ class DT_Test //:public ACE_Task <ACE_SYNCH> /* protected: */ /* /// task svc */ -/* virtual int svc (void); */ +/* virtual int svc (); */ private: diff --git a/TAO/examples/RTScheduling/Thread_Task.h b/TAO/examples/RTScheduling/Thread_Task.h index d1ee2633609..0079d0e256e 100644 --- a/TAO/examples/RTScheduling/Thread_Task.h +++ b/TAO/examples/RTScheduling/Thread_Task.h @@ -40,7 +40,7 @@ class RTSCHEDTESTLIB_Export Thread_Task : public ACE_Task <ACE_SYNCH> protected: /// task svc - virtual int svc (void); + virtual int svc (); RTScheduling::Current_var current_; CORBA::Policy_var sched_param_; time_t start_time_; diff --git a/TAO/examples/Simple/time-date/Time_Date.h b/TAO/examples/Simple/time-date/Time_Date.h index c24a97e8215..fb63add9109 100644 --- a/TAO/examples/Simple/time-date/Time_Date.h +++ b/TAO/examples/Simple/time-date/Time_Date.h @@ -39,10 +39,10 @@ public: virtual int init (int argc, ACE_TCHAR *argv[]); /// Shutdown the @c TAO_ORB_Manager. - virtual int fini (void); + virtual int fini (); /// Concurrency hook. - virtual int svc (void); + virtual int svc (); public: /// ORB pseudo-reference. |