diff options
Diffstat (limited to 'TAO/orbsvcs/tests/Property/server.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/Property/server.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/TAO/orbsvcs/tests/Property/server.cpp b/TAO/orbsvcs/tests/Property/server.cpp index 12eac84b999..bcaeae71a5f 100644 --- a/TAO/orbsvcs/tests/Property/server.cpp +++ b/TAO/orbsvcs/tests/Property/server.cpp @@ -25,7 +25,7 @@ ACE_RCSID(CosPropertyService, server, "$Id$") int main (int argc, char ** argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -35,7 +35,7 @@ main (int argc, char ** argv) m.init_child_poa (argc, argv, "child_poa" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Using naming server. @@ -49,7 +49,7 @@ main (int argc, char ** argv) TAO_PropertySetDef, -1); CosPropertyService::PropertySetDef_var propsetdef = - propsetdef_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + propsetdef_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CosNaming::Name propsetdef_name (1); @@ -57,28 +57,28 @@ main (int argc, char ** argv) propsetdef_name[0].id = CORBA::string_dup ("PropertySetDef"); my_name_client->bind (propsetdef_name, propsetdef.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Any any_val; // Make this IOR as one of the properties in there. - any_val <<= propsetdef_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + any_val <<= propsetdef_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::Object_var ior = propsetdef_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Object_var ior = propsetdef_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_ptr ior_ptr = ior.in (); any_val <<= ior_ptr; // any_val.replace (CORBA::_tc_Object, // &ior_ptr, // 1 - // TAO_ENV_ARG_PARAMETER); + // ACE_ENV_ARG_PARAMETER); // ACE_TRY_CHECK; propsetdef_impl->define_property_with_mode ("PropertySetDef_IOR", any_val, CosPropertyService::fixed_readonly - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create PropertySet factory and then register. @@ -87,7 +87,7 @@ main (int argc, char ** argv) TAO_PropertySetFactory, -1); CosPropertyService::PropertySetFactory_var propset_factory = - propset_factory_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + propset_factory_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CosNaming::Name propset_factory_name (1); @@ -95,11 +95,11 @@ main (int argc, char ** argv) propset_factory_name[0].id = CORBA::string_dup ("PropertySetFactory"); my_name_client->bind (propset_factory_name, propset_factory.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Run the ORB Event loop. - m.run (TAO_ENV_SINGLE_ARG_PARAMETER); + m.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) |