diff options
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index d1c6a1f13e0..5063640e302 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Thu Sep 25 11:54:42 2003 Pradeep Gore <pradeep@oomworks.com> + + * orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h: + * orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp: + + Renamed the <init> method to <_init>. This avoids warnings on + solaris regarding hiding the ACE_Shared_Object::init signature. + Thu Sep 25 10:08:12 2003 Chris Cleeland <cleeland_c@ociweb.com> * orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp: diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp index 9cb445b5596..ef6f077004f 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp @@ -61,7 +61,7 @@ TAO_Notify_ThreadPool_Consumer_Client::parse_args (int argc, char *argv[]) } void -TAO_Notify_ThreadPool_Consumer_Client::init (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_ThreadPool_Consumer_Client::_init (ACE_ENV_SINGLE_ARG_DECL) { PortableServer::POAManager_var poa_manager = this->orb_objects_.root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -196,7 +196,7 @@ TAO_Notify_ThreadPool_Consumer_Client::svc (void) this->orb_objects_.current_->the_priority (0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->init (ACE_ENV_SINGLE_ARG_PARAMETER); //Init the Client + this->_init (ACE_ENV_SINGLE_ARG_PARAMETER); //Init the Client ACE_TRY_CHECK; this->run (ACE_ENV_SINGLE_ARG_PARAMETER); diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h index df4bae8ba8b..af826ecfe23 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h @@ -37,7 +37,7 @@ public: ~TAO_Notify_ThreadPool_Consumer_Client (); /// Init - void init (ACE_ENV_SINGLE_ARG_DECL); + void _init (ACE_ENV_SINGLE_ARG_DECL); /// Run void run (ACE_ENV_SINGLE_ARG_DECL); |