From 23a2da2849c041677004a4bf1f19506aa5b0e083 Mon Sep 17 00:00:00 2001 From: sma Date: Thu, 19 Jun 2008 14:46:44 +0000 Subject: ChangeLogTag: Thu Jun 19 14:46:00 UTC 2008 Simon Massey --- TAO/ChangeLog | 23 ++++++++++++++++++++++ .../Factory_Service/FTRTEC_Factory_Service.cpp | 20 +++++++++---------- TAO/orbsvcs/LoadBalancer/LoadManager.cpp | 4 +--- TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp | 4 +--- .../Basic_Logging_Service.cpp | 4 +--- .../Notify_Logging_Service.cpp | 4 +--- .../RTEvent_Logging_Service.cpp | 4 +--- .../examples/CosEC/Factory/FactoryClient.cpp | 4 +--- .../examples/CosEC/Factory/FactoryDriver.cpp | 4 +--- .../CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp | 4 +--- .../CosEC/RtEC_Based/tests/Basic/Basic.cpp | 4 +--- .../CosEC/RtEC_Based/tests/Multiple/Multiple.cpp | 4 +--- TAO/orbsvcs/examples/Notify/Filter/Filter.cpp | 7 ++----- .../examples/Notify/Lanes/Consumer_Client.cpp | 6 ++---- .../examples/Notify/Lanes/Supplier_Client.cpp | 6 ++---- .../examples/Notify/Subscribe/Subscribe.cpp | 7 ++----- .../examples/Notify/ThreadPool/Consumer_Client.cpp | 6 ++---- .../examples/Notify/ThreadPool/Supplier_Client.cpp | 6 ++---- TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp | 3 +-- 19 files changed, 56 insertions(+), 68 deletions(-) diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 5f4030ea2c0..6002cc2aee1 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,26 @@ +Thu Jun 19 14:46:00 UTC 2008 Simon Massey + + * orbsvcs/examples/CosEC/Factory/FactoryClient.cpp: + * orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp: + * orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp: + * orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp: + * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp: + * orbsvcs/examples/Notify/Filter/Filter.cpp: + * orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp: + * orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp: + * orbsvcs/examples/Notify/Subscribe/Subscribe.cpp: + * orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp: + * orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp: + * orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp: + * orbsvcs/LoadBalancer/LoadManager.cpp: + * orbsvcs/LoadBalancer/LoadMonitor.cpp: + * orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp: + * orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp: + * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp: + * orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp: + + Remove redundant "" 3rd parameter (orbID) from ORB_init() calls. + Thu Jun 19 14:25:00 UTC 2008 Simon Massey * examples/AMH/Sink_Server/Base_Server.cpp: diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp index f9e0cb37295..304d6b27dd9 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp @@ -38,7 +38,7 @@ int parse_args(int argc, char* argv[]) } } - if (result == -1 || (id.length() == 0 && output.length() == 0)) + if (result == -1 || (id.length () == 0 && output.length () == 0)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Usage: %s \n") @@ -52,29 +52,29 @@ int parse_args(int argc, char* argv[]) return 0; } -int main(int argc, ACE_TCHAR* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { try{ - CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, ""); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); - if (parse_args(argc, argv) == -1) + if (parse_args (argc, argv) == -1) return -1; CORBA::Object_var obj = - orb->resolve_initial_references("RootPOA"); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var poa = - PortableServer::POA::_narrow(obj.in()); + PortableServer::POA::_narrow (obj.in ()); - PortableServer::POAManager_var mgr = poa->the_POAManager(); + PortableServer::POAManager_var mgr = poa->the_POAManager (); - mgr->activate(); + mgr->activate (); - EventChannelFactory_i servant("factory.cfg", orb.in()); + EventChannelFactory_i servant ("factory.cfg", orb.in ()); FT::GenericFactory_var event_channel_factory = - servant._this(); + servant._this (); // register to the Event Service diff --git a/TAO/orbsvcs/LoadBalancer/LoadManager.cpp b/TAO/orbsvcs/LoadBalancer/LoadManager.cpp index 99a2392ba3a..f95a8c70251 100644 --- a/TAO/orbsvcs/LoadBalancer/LoadManager.cpp +++ b/TAO/orbsvcs/LoadBalancer/LoadManager.cpp @@ -118,9 +118,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { // The usual server side boilerplate code. - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, - ""); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA"); diff --git a/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp b/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp index 0b67b92f0b4..9216afbbb35 100644 --- a/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp +++ b/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp @@ -242,9 +242,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { // The usual server side boilerplate code. - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, - ""); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); // Check the non-ORB arguments. ::parse_args (argc, diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp index 607b2f29bcd..9b60326ad05 100644 --- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp +++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp @@ -28,9 +28,7 @@ Basic_Logging_Service::~Basic_Logging_Service (void) void Basic_Logging_Service::init_ORB (int& argc, char *argv []) { - this->orb_ = CORBA::ORB_init (argc, - argv, - ""); + this->orb_ = CORBA::ORB_init (argc, argv); CORBA::Object_var poa_object = this->orb_->resolve_initial_references("RootPOA"); diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp index c001d557c93..bef1b328826 100644 --- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp +++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp @@ -29,9 +29,7 @@ Notify_Logging_Service::~Notify_Logging_Service (void) int Notify_Logging_Service::init_ORB (int& argc, char *argv []) { - this->orb_ = CORBA::ORB_init (argc, - argv, - ""); + this->orb_ = CORBA::ORB_init (argc, argv); this->notify_service_ = TAO_Notify_Service::load_default (); diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp index 6d46dfea129..ee5f8886224 100644 --- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp +++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp @@ -27,9 +27,7 @@ RTEvent_Logging_Service::~RTEvent_Logging_Service (void) void RTEvent_Logging_Service::init_ORB (int& argc, char *argv[]) { - this->orb_ = CORBA::ORB_init (argc, - argv, - ""); + this->orb_ = CORBA::ORB_init (argc, argv); CORBA::Object_var poa_object = this->orb_->resolve_initial_references("RootPOA"); diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp index 87b18edc6fa..e66b22e582d 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp +++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp @@ -85,9 +85,7 @@ void FactoryClient::init_ORB (int argc, char *argv []) { - this->orb_ = CORBA::ORB_init (argc, - argv, - ""); + this->orb_ = CORBA::ORB_init (argc, argv); } void diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp index ce42d9e6b87..a37f5796fc7 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp +++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp @@ -54,9 +54,7 @@ FactoryDriver::start (int argc, char *argv []) { try { - orb_ = CORBA::ORB_init (argc, - argv, - ""); + orb_ = CORBA::ORB_init (argc, argv); if (this->parse_args (argc, argv) == -1) return -1; diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp index 456d1712db5..276e6d8b327 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp @@ -20,9 +20,7 @@ RtEC_Based_CosEC::~RtEC_Based_CosEC (void) void RtEC_Based_CosEC::init_ORB (int& argc, char *argv []) { - this->orb_ = CORBA::ORB_init (argc, - argv, - ""); + this->orb_ = CORBA::ORB_init (argc, argv); CORBA::Object_var poa_object = this->orb_->resolve_initial_references("RootPOA"); diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp index 98c5602a60b..dab214bd046 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp @@ -52,9 +52,7 @@ Basic::init (int argc, char *argv[]) void Basic::init_ORB (int argc, char *argv []) { - this->orb_ = CORBA::ORB_init (argc, - argv, - ""); + this->orb_ = CORBA::ORB_init (argc, argv); CORBA::Object_var poa_object = this->orb_->resolve_initial_references("RootPOA"); diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp index a0ebbe627fc..b16dbd64c78 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp @@ -41,9 +41,7 @@ Multiple::init_ORB (int argc, char *argv []) { try { - this->orb_ = CORBA::ORB_init (argc, - argv, - ""); + this->orb_ = CORBA::ORB_init (argc, argv); CORBA::Object_var poa_object = this->orb_->resolve_initial_references("RootPOA"); diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp index aeb872a8b54..61529edd7c0 100644 --- a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp +++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp @@ -68,12 +68,9 @@ FilterClient::done (void) } void -FilterClient::init_ORB (int argc, - char *argv []) +FilterClient::init_ORB (int argc, char *argv []) { - this->orb_ = CORBA::ORB_init (argc, - argv, - ""); + this->orb_ = CORBA::ORB_init (argc, argv); CORBA::Object_ptr poa_object = this->orb_->resolve_initial_references("RootPOA"); diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp index c1b49f18963..83f0c7ce8dc 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp @@ -190,14 +190,12 @@ TAO_Notify_Lanes_Consumer_Client::svc (void) } int -ACE_TMAIN(int argc, ACE_TCHAR *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { try { // Initialize an ORB - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, - ""); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); TAO_Notify_ORB_Objects orb_objects; diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp index bb8bdd46479..c540938cac3 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp @@ -196,14 +196,12 @@ TAO_Notify_Lanes_Supplier_Client::svc (void) } int -ACE_TMAIN(int argc, ACE_TCHAR *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { try { // Initialize an ORB - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, - ""); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); // Create a holder for the common ORB Objects. TAO_Notify_ORB_Objects orb_objects; diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp index bf9b59f62fd..d84fb147ec4 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp +++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp @@ -63,12 +63,9 @@ Subscribe::done (void) } void -Subscribe::init_ORB (int argc, - char *argv []) +Subscribe::init_ORB (int argc, char *argv []) { - this->orb_ = CORBA::ORB_init (argc, - argv, - ""); + this->orb_ = CORBA::ORB_init (argc, argv); CORBA::Object_ptr poa_object = this->orb_->resolve_initial_references("RootPOA"); diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp index 9c0485e5420..b5a41fe1203 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp @@ -194,14 +194,12 @@ TAO_Notify_ThreadPool_Consumer_Client::svc (void) } int -ACE_TMAIN(int argc, ACE_TCHAR *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { try { // Initialize an ORB - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, - ""); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); TAO_Notify_ORB_Objects orb_objects; diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp index 3fe4cd65867..6d57b4f85f5 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp @@ -193,14 +193,12 @@ TAO_Notify_ThreadPool_Supplier_Client::svc (void) } int -ACE_TMAIN(int argc, ACE_TCHAR *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { try { // Initialize an ORB - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, - ""); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); // Create a holder for the common ORB Objects. TAO_Notify_ORB_Objects orb_objects; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp index 4568a942049..0c3401f769f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp @@ -42,11 +42,10 @@ TAO_EC_RTCORBA_Factory::create_dispatching (TAO_EC_Event_Channel_Base *) TAO_EC_Dispatching *dispatching = 0; try { - // @@ The ORBId could be important!!! int argc = 0; ACE_TCHAR **argv = 0; CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, ""); + CORBA::ORB_init (argc, argv); CORBA::Object_var obj = orb->resolve_initial_references ("PriorityMappingManager"); -- cgit v1.2.1