diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-06-21 06:21:29 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-06-21 06:21:29 +0000 |
| commit | 628b36ded70b16eb1cc17af53c90bcbde264ccd4 (patch) | |
| tree | cf8b27ba42435be0e6925ae5a22c7d2d32598f68 /TAO/orbsvcs/Logging_Service | |
| parent | b07dccd76cc461f9ada35391c1ffdd79fd95112e (diff) | |
| download | ATCD-628b36ded70b16eb1cc17af53c90bcbde264ccd4.tar.gz | |
ChangeLogTag: Mon Jun 20 23:17:42 2005 J.T. Conklin <jtc@acorntoolworks.com>
Diffstat (limited to 'TAO/orbsvcs/Logging_Service')
4 files changed, 29 insertions, 25 deletions
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 ad74d7dc41d..c8e2053832b 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 @@ -121,14 +121,15 @@ Basic_Logging_Service::startup (int argc, char *argv[] this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - if (true) + if (true) { - CORBA::Object_var table_object = - this->orb_->resolve_initial_references ("IORTable"); + CORBA::Object_var table_object = + this->orb_->resolve_initial_references ("IORTable" + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - IORTable::Table_var adapter = - IORTable::Table::_narrow (table_object.in ()); + IORTable::Table_var adapter = + IORTable::Table::_narrow (table_object.in ()); ACE_CHECK_RETURN (-1); adapter->bind("BasicLogService", ior.in ()); diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp index 3d3318a201d..7ea0c6243cb 100644 --- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp +++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp @@ -28,7 +28,7 @@ Event_Logging_Service::~Event_Logging_Service (void) void Event_Logging_Service::init_ORB (int& argc, char *argv [] - ACE_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init (argc, argv, @@ -122,14 +122,15 @@ Event_Logging_Service::startup (int argc, char *argv[] this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - if (true) + if (true) { - CORBA::Object_var table_object = - this->orb_->resolve_initial_references ("IORTable"); + CORBA::Object_var table_object = + this->orb_->resolve_initial_references ("IORTable" + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - IORTable::Table_var adapter = - IORTable::Table::_narrow (table_object.in ()); + IORTable::Table_var adapter = + IORTable::Table::_narrow (table_object.in ()); ACE_CHECK_RETURN (-1); adapter->bind("EventLogService", ior.in ()); 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 28b149656fd..bfe6b02e18b 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 @@ -148,14 +148,15 @@ Notify_Logging_Service::init (int argc, char *argv[] this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - if (true) + if (true) { - CORBA::Object_var table_object = - this->orb_->resolve_initial_references ("IORTable"); + CORBA::Object_var table_object = + this->orb_->resolve_initial_references ("IORTable" + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - IORTable::Table_var adapter = - IORTable::Table::_narrow (table_object.in ()); + IORTable::Table_var adapter = + IORTable::Table::_narrow (table_object.in ()); ACE_CHECK_RETURN (-1); adapter->bind("NotifyLogService", ior.in ()); 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 1d23a487199..2b9cece24f3 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 @@ -207,18 +207,19 @@ RTEvent_Logging_Service::run (int argc, char* argv[]) ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (true) + if (true) { - CORBA::Object_var table_object = - this->orb_->resolve_initial_references ("IORTable"); - ACE_CHECK_RETURN (-1); + CORBA::Object_var table_object = + this->orb_->resolve_initial_references ("IORTable" + ACE_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN (-1); - IORTable::Table_var adapter = - IORTable::Table::_narrow (table_object.in ()); - ACE_CHECK_RETURN (-1); + IORTable::Table_var adapter = + IORTable::Table::_narrow (table_object.in ()); + ACE_CHECK_RETURN (-1); - adapter->bind("RTEventLogService", ior.in ()); - ACE_CHECK_RETURN (-1); + adapter->bind("RTEventLogService", ior.in ()); + ACE_CHECK_RETURN (-1); } if (this->ior_file_name_ != 0) |