diff options
Diffstat (limited to 'TAO/examples/CSD_Strategy/ThreadPool5')
6 files changed, 33 insertions, 70 deletions
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 |