diff options
Diffstat (limited to 'TAO/examples/CSD_Strategy/ThreadPool3')
4 files changed, 18 insertions, 48 deletions
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 |