diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp index 1e12d7b1383..9f39cd79c65 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp @@ -31,17 +31,17 @@ TAO_Naming_Loader::~TAO_Naming_Loader (void) int TAO_Naming_Loader::init (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // This function call initializes the Naming Service CORBA::Object_var object = - this->create_object (orb.in (), argc, argv TAO_ENV_ARG_PARAMETER); + this->create_object (orb.in (), argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -63,7 +63,7 @@ TAO_Naming_Loader::fini (void) CORBA::Object_ptr TAO_Naming_Loader::create_object (CORBA::ORB_ptr orb, int argc, char *argv[] - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { int result; |