summaryrefslogtreecommitdiff
path: root/TAO/tests/OBV
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tests/OBV')
-rw-r--r--TAO/tests/OBV/Any/AnyS_impl.cpp6
-rw-r--r--TAO/tests/OBV/Any/AnyS_impl.h4
-rw-r--r--TAO/tests/OBV/Any/client.cpp44
-rw-r--r--TAO/tests/OBV/Any/server.cpp20
-rw-r--r--TAO/tests/OBV/Factory/FactoryS_impl.cpp10
-rw-r--r--TAO/tests/OBV/Factory/FactoryS_impl.h8
-rw-r--r--TAO/tests/OBV/Factory/client.cpp50
-rw-r--r--TAO/tests/OBV/Factory/server.cpp20
-rw-r--r--TAO/tests/OBV/Forward/Test_impl.cpp6
-rw-r--r--TAO/tests/OBV/Forward/Test_impl.h4
-rw-r--r--TAO/tests/OBV/Forward/client.cpp66
-rw-r--r--TAO/tests/OBV/Forward/server.cpp42
12 files changed, 140 insertions, 140 deletions
diff --git a/TAO/tests/OBV/Any/AnyS_impl.cpp b/TAO/tests/OBV/Any/AnyS_impl.cpp
index a72282b7b70..93bdea4f54e 100644
--- a/TAO/tests/OBV/Any/AnyS_impl.cpp
+++ b/TAO/tests/OBV/Any/AnyS_impl.cpp
@@ -13,7 +13,7 @@ Test_impl::Test_impl (CORBA::ORB_ptr orb)
CORBA::Any*
Test_impl::get_something (
CORBA::Boolean need_vb
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::Any_var ret_val;
@@ -47,8 +47,8 @@ Test_impl::get_something (
}
void
-Test_impl::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Test_impl::shutdown (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+ this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
}
diff --git a/TAO/tests/OBV/Any/AnyS_impl.h b/TAO/tests/OBV/Any/AnyS_impl.h
index 1a22a2ae45c..d33df851ddc 100644
--- a/TAO/tests/OBV/Any/AnyS_impl.h
+++ b/TAO/tests/OBV/Any/AnyS_impl.h
@@ -33,10 +33,10 @@ public:
virtual CORBA::Any * get_something (
CORBA::Boolean need_vb
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/tests/OBV/Any/client.cpp b/TAO/tests/OBV/Any/client.cpp
index e66581f45f7..d05b02b2331 100644
--- a/TAO/tests/OBV/Any/client.cpp
+++ b/TAO/tests/OBV/Any/client.cpp
@@ -42,45 +42,45 @@ main (int argc, char *argv[])
ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test started.\n"));
CORBA::ORB_var orb =
- CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
+ CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (parse_args (argc, argv) != 0)
return 1;
- // Create and register factories.
-
- OBV_AnyTest::VA_init *va_factory = 0;
- ACE_NEW_RETURN (va_factory,
+ // Create and register factories.
+
+ OBV_AnyTest::VA_init *va_factory = 0;
+ ACE_NEW_RETURN (va_factory,
OBV_AnyTest::VA_init,
1); // supplied by mapping
orb->register_value_factory (va_factory->tao_repository_id (),
va_factory
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
va_factory->_remove_ref (); // release ownership
- OBV_AnyTest::VB_init *vb_factory = 0;
- ACE_NEW_RETURN (vb_factory,
+ OBV_AnyTest::VB_init *vb_factory = 0;
+ ACE_NEW_RETURN (vb_factory,
OBV_AnyTest::VB_init,
1); // supplied by mapping
orb->register_value_factory (vb_factory->tao_repository_id (),
vb_factory
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
vb_factory->_remove_ref (); // release ownership
// Obtain reference to the object
CORBA::Object_var tmp =
- orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
+ orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
OBV_AnyTest::Test_var test =
- OBV_AnyTest::Test::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
+ OBV_AnyTest::Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (CORBA::is_nil (test.in ()))
@@ -93,7 +93,7 @@ main (int argc, char *argv[])
// Do local test
- OBV_AnyTest::VA_var va1, va2;
+ OBV_AnyTest::VA_var va1, va2;
ACE_NEW_RETURN (va1, OBV_OBV_AnyTest::VA, 1);
ACE_NEW_RETURN (va2, OBV_OBV_AnyTest::VA, 1);
@@ -106,7 +106,7 @@ main (int argc, char *argv[])
// Test both copying and non-copying version of operator<<=
a1 <<= va1.in ();
-
+
OBV_AnyTest::VA *pva = va2._retn();
a2 <<= &pva;
@@ -114,29 +114,29 @@ main (int argc, char *argv[])
if (!(a1 >>= dst) || dst->id () != magic)
{
- ACE_ERROR_RETURN ((LM_DEBUG,
+ ACE_ERROR_RETURN ((LM_DEBUG,
"(%P|%t) client - test failed.\n"),
1);
}
if (!(a2 >>= dst) || dst->id () != magic)
{
- ACE_ERROR_RETURN ((LM_DEBUG,
+ ACE_ERROR_RETURN ((LM_DEBUG,
"(%P|%t) client - test failed.\n"),
1);
}
// Now do remote test
-
+
// STEP 1.
CORBA::Any_var result = test->get_something (
0
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (!(*result >>= dst) || dst->id () != magic)
{
- ACE_ERROR_RETURN ((LM_DEBUG,
+ ACE_ERROR_RETURN ((LM_DEBUG,
"(%P|%t) client - test failed.\n"),
1);
}
@@ -145,20 +145,20 @@ main (int argc, char *argv[])
OBV_AnyTest::VB* dst_vb = 0;
result = test->get_something (
1
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (!(*result >>= dst_vb) || dst_vb->id () != magic)
{
- ACE_ERROR_RETURN ((LM_DEBUG,
+ ACE_ERROR_RETURN ((LM_DEBUG,
"(%P|%t) client - test failed.\n"),
1);
}
- test->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+ test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
- orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+ orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test finished.\n"));
diff --git a/TAO/tests/OBV/Any/server.cpp b/TAO/tests/OBV/Any/server.cpp
index 43e37869510..7b8ac3453bb 100644
--- a/TAO/tests/OBV/Any/server.cpp
+++ b/TAO/tests/OBV/Any/server.cpp
@@ -39,15 +39,15 @@ main (int argc, char *argv[])
ACE_TRY_NEW_ENV
{
CORBA::ORB_var orb =
- CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
+ CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
CORBA::Object_var poa_object =
- orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+ orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
PortableServer::POA_var root_poa =
- PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+ PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (CORBA::is_nil (root_poa.in ()))
@@ -56,7 +56,7 @@ main (int argc, char *argv[])
1);
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+ root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
if (parse_args (argc, argv) != 0)
@@ -70,11 +70,11 @@ main (int argc, char *argv[])
PortableServer::ServantBase_var owner_transfer(test_impl);
OBV_AnyTest::Test_var test =
- test_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
CORBA::String_var ior =
- orb->object_to_string (test.in () TAO_ENV_ARG_PARAMETER);
+ orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
// If the ior_output_file exists, output the ior to it
@@ -87,20 +87,20 @@ main (int argc, char *argv[])
ACE_OS::fprintf (output_file, "%s", ior.in ());
ACE_OS::fclose (output_file);
- poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+ poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop started.\n"));
- orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+ orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished.\n"));
- root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+ root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+ orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
diff --git a/TAO/tests/OBV/Factory/FactoryS_impl.cpp b/TAO/tests/OBV/Factory/FactoryS_impl.cpp
index c317f605e8b..49bd2e9401b 100644
--- a/TAO/tests/OBV/Factory/FactoryS_impl.cpp
+++ b/TAO/tests/OBV/Factory/FactoryS_impl.cpp
@@ -12,7 +12,7 @@ Test_impl::Test_impl (CORBA::ORB_ptr orb)
}
OBV_FactoryTest::BaseValue *
-Test_impl::get_base_value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_impl::get_base_value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
OBV_FactoryTest::BaseValue* ret_val = 0;
@@ -24,7 +24,7 @@ Test_impl::get_base_value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
}
OBV_FactoryTest::Value1 *
-Test_impl::get_value1 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_impl::get_value1 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
OBV_FactoryTest::Value1* ret_val = 0;
@@ -36,7 +36,7 @@ Test_impl::get_value1 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
}
OBV_FactoryTest::Value2 *
-Test_impl::get_value2 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_impl::get_value2 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
OBV_FactoryTest::Value2* ret_val = 0;
@@ -48,8 +48,8 @@ Test_impl::get_value2 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
}
void
-Test_impl::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Test_impl::shutdown (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+ this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
}
diff --git a/TAO/tests/OBV/Factory/FactoryS_impl.h b/TAO/tests/OBV/Factory/FactoryS_impl.h
index 00c41b901d3..8a1e97a6a5a 100644
--- a/TAO/tests/OBV/Factory/FactoryS_impl.h
+++ b/TAO/tests/OBV/Factory/FactoryS_impl.h
@@ -31,16 +31,16 @@ public:
Test_impl (CORBA::ORB_ptr orb);
// ctor
- virtual OBV_FactoryTest::BaseValue * get_base_value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual OBV_FactoryTest::BaseValue * get_base_value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual OBV_FactoryTest::Value1 * get_value1 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual OBV_FactoryTest::Value1 * get_value1 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual OBV_FactoryTest::Value2 * get_value2 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual OBV_FactoryTest::Value2 * get_value2 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+ virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/tests/OBV/Factory/client.cpp b/TAO/tests/OBV/Factory/client.cpp
index 2d73e319292..1ccfce1b4a2 100644
--- a/TAO/tests/OBV/Factory/client.cpp
+++ b/TAO/tests/OBV/Factory/client.cpp
@@ -40,59 +40,59 @@ main (int argc, char *argv[])
ACE_TRY_NEW_ENV
{
CORBA::ORB_var orb =
- CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
+ CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (parse_args (argc, argv) != 0)
return 1;
- // Create factories.
-
- OBV_FactoryTest::BaseValue_init *base_factory = 0;
- ACE_NEW_RETURN (base_factory,
+ // Create factories.
+
+ OBV_FactoryTest::BaseValue_init *base_factory = 0;
+ ACE_NEW_RETURN (base_factory,
OBV_FactoryTest::BaseValue_init,
1); // supplied by mapping
orb->register_value_factory (base_factory->tao_repository_id (),
- base_factory
- TAO_ENV_ARG_PARAMETER);
+ base_factory
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
base_factory->_remove_ref (); // release ownership
OBV_FactoryTest::Value1_init *value1_factory = 0;
- ACE_NEW_RETURN (value1_factory,
+ ACE_NEW_RETURN (value1_factory,
OBV_FactoryTest::Value1_init,
1); // supplied by mapping
orb->register_value_factory (value1_factory->tao_repository_id (),
value1_factory
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
value1_factory->_remove_ref ();
-
+
OBV_FactoryTest::Value2_init *value2_factory = 0;
- ACE_NEW_RETURN (value2_factory,
+ ACE_NEW_RETURN (value2_factory,
Value2_init_impl,
1); // custom implementation
orb->register_value_factory (value2_factory->tao_repository_id (),
- value2_factory
- TAO_ENV_ARG_PARAMETER);
+ value2_factory
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
value2_factory->_remove_ref ();
// Obtain reference to the object
CORBA::Object_var tmp =
- orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
+ orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
OBV_FactoryTest::Test_var test =
- OBV_FactoryTest::Test::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
+ OBV_FactoryTest::Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (CORBA::is_nil (test.in ()))
@@ -103,22 +103,22 @@ main (int argc, char *argv[])
1);
}
- // Now perform the test. I don't check return values.
+ // Now perform the test. I don't check return values.
// I just hope to get MARSHAL.
- OBV_FactoryTest::BaseValue_var base_value =
- test->get_base_value (TAO_ENV_SINGLE_ARG_PARAMETER);
+ OBV_FactoryTest::BaseValue_var base_value =
+ test->get_base_value (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
- OBV_FactoryTest::Value1_var value1 =
- test->get_value1 (TAO_ENV_SINGLE_ARG_PARAMETER);
+ OBV_FactoryTest::Value1_var value1 =
+ test->get_value1 (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
- OBV_FactoryTest::Value2_var value2 =
- test->get_value2 (TAO_ENV_SINGLE_ARG_PARAMETER);
+ OBV_FactoryTest::Value2_var value2 =
+ test->get_value2 (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
// Test factories.
-
+
value2 = value2_factory->create_default (1);
OBV_FactoryTest::BaseValue::BV_Data data;
@@ -128,10 +128,10 @@ main (int argc, char *argv[])
ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test finished\n"));
- test->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+ test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
- orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+ orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
diff --git a/TAO/tests/OBV/Factory/server.cpp b/TAO/tests/OBV/Factory/server.cpp
index 00b6d8d8eb2..af5c6e5ce19 100644
--- a/TAO/tests/OBV/Factory/server.cpp
+++ b/TAO/tests/OBV/Factory/server.cpp
@@ -39,15 +39,15 @@ main (int argc, char *argv[])
ACE_TRY_NEW_ENV
{
CORBA::ORB_var orb =
- CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
+ CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
CORBA::Object_var poa_object =
- orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+ orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
PortableServer::POA_var root_poa =
- PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+ PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (CORBA::is_nil (root_poa.in ()))
@@ -56,7 +56,7 @@ main (int argc, char *argv[])
1);
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+ root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
if (parse_args (argc, argv) != 0)
@@ -70,11 +70,11 @@ main (int argc, char *argv[])
PortableServer::ServantBase_var owner_transfer(test_impl);
OBV_FactoryTest::Test_var test =
- test_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
CORBA::String_var ior =
- orb->object_to_string (test.in () TAO_ENV_ARG_PARAMETER);
+ orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
// If the ior_output_file exists, output the ior to it
@@ -87,18 +87,18 @@ main (int argc, char *argv[])
ACE_OS::fprintf (output_file, "%s", ior.in ());
ACE_OS::fclose (output_file);
- poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+ poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
- orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+ orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
- root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+ root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+ orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
diff --git a/TAO/tests/OBV/Forward/Test_impl.cpp b/TAO/tests/OBV/Forward/Test_impl.cpp
index 207f1cbce9a..bfc72998512 100644
--- a/TAO/tests/OBV/Forward/Test_impl.cpp
+++ b/TAO/tests/OBV/Forward/Test_impl.cpp
@@ -31,7 +31,7 @@ reflect_node (BaseNode_ptr bn)
TreeController *
Test_impl::reflect (TreeController * tc
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (tc != 0)
@@ -43,8 +43,8 @@ Test_impl::reflect (TreeController * tc
}
void
-Test_impl::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Test_impl::shutdown (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+ this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
}
diff --git a/TAO/tests/OBV/Forward/Test_impl.h b/TAO/tests/OBV/Forward/Test_impl.h
index 50b172bdf4f..745f255ad87 100644
--- a/TAO/tests/OBV/Forward/Test_impl.h
+++ b/TAO/tests/OBV/Forward/Test_impl.h
@@ -33,10 +33,10 @@ public:
virtual TreeController * reflect (
TreeController * tc
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+ virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/tests/OBV/Forward/client.cpp b/TAO/tests/OBV/Forward/client.cpp
index cb4860dae7c..b71178be956 100644
--- a/TAO/tests/OBV/Forward/client.cpp
+++ b/TAO/tests/OBV/Forward/client.cpp
@@ -37,7 +37,7 @@ parse_args (int argc, char *argv[])
return 0;
}
-void
+void
dump_node (BaseNode_ptr bn, int indent)
{
if (bn == 0) return;
@@ -51,29 +51,29 @@ dump_node (BaseNode_ptr bn, int indent)
{
ACE_DEBUG ((LM_DEBUG, "%x <StringNode> %s\n",
bn,
- sn->name ()));
+ sn->name ()));
}
else
{
- ACE_DEBUG ((LM_DEBUG,
+ ACE_DEBUG ((LM_DEBUG,
"%x <BaseNode> \n",
- bn));
+ bn));
}
dump_node (bn->left (), indent + 1);
dump_node (bn->right (), indent + 1);
}
-void
+void
dump_tree (TreeController_ptr tc)
{
- ACE_DEBUG ((LM_DEBUG,
+ ACE_DEBUG ((LM_DEBUG,
"(%P|%t) start tree dump <%x>\n",
tc));
dump_node (tc->root (), 1);
- ACE_DEBUG ((LM_DEBUG,
+ ACE_DEBUG ((LM_DEBUG,
"(%P|%t) end tree dump <%x>\n",
tc));
}
@@ -85,7 +85,7 @@ main (int argc, char *argv[])
ACE_TRY_NEW_ENV
{
CORBA::ORB_var orb =
- CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
+ CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (parse_args (argc, argv) != 0)
@@ -95,38 +95,38 @@ main (int argc, char *argv[])
// compiler so we just to put everything in a right order.
// Create and register factory for BaseNode.
- BaseNode_init *bn_factory = 0;
- ACE_NEW_RETURN (bn_factory,
+ BaseNode_init *bn_factory = 0;
+ ACE_NEW_RETURN (bn_factory,
BaseNode_init,
1);
orb->register_value_factory (bn_factory->tao_repository_id (),
- bn_factory
- TAO_ENV_ARG_PARAMETER);
+ bn_factory
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
bn_factory->_remove_ref (); // release ownership
// Create and register factory for TreeController.
- TreeController_init *tc_factory = 0;
- ACE_NEW_RETURN (tc_factory,
+ TreeController_init *tc_factory = 0;
+ ACE_NEW_RETURN (tc_factory,
TreeController_init,
1);
orb->register_value_factory (tc_factory->tao_repository_id (),
- tc_factory
- TAO_ENV_ARG_PARAMETER);
+ tc_factory
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
tc_factory->_remove_ref (); // release ownership
// Create and register factory for StringNode.
- StringNode_init *sn_factory = 0;
- ACE_NEW_RETURN (sn_factory,
+ StringNode_init *sn_factory = 0;
+ ACE_NEW_RETURN (sn_factory,
StringNode_init,
1);
orb->register_value_factory (sn_factory->tao_repository_id (),
- sn_factory
- TAO_ENV_ARG_PARAMETER);
+ sn_factory
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
sn_factory->_remove_ref (); // release ownership
@@ -134,10 +134,10 @@ main (int argc, char *argv[])
// Obtain reference to the object.
CORBA::Object_var tmp =
- orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
+ orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- Test_var test = Test::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
+ Test_var test = Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (CORBA::is_nil (test.in ()))
@@ -149,16 +149,16 @@ main (int argc, char *argv[])
}
// Now build simple graph (tree in our case).
-
+
TreeController_var tc;
- ACE_NEW_RETURN (tc,
+ ACE_NEW_RETURN (tc,
OBV_TreeController,
1);
// Create the root node.
{
StringNode_var sn;
- ACE_NEW_RETURN (sn,
+ ACE_NEW_RETURN (sn,
OBV_StringNode,
1);
sn->name ((const char*)("RootNode"));
@@ -167,17 +167,17 @@ main (int argc, char *argv[])
// Create the left leaf.
{
StringNode_var dummy;
- ACE_NEW_RETURN (dummy,
+ ACE_NEW_RETURN (dummy,
OBV_StringNode,
1);
dummy->name ((const char*)("LeftNode"));
- sn->left (dummy);
+ sn->left (dummy);
}
// Create the right leaf.
{
StringNode_var dummy;
- ACE_NEW_RETURN (dummy,
+ ACE_NEW_RETURN (dummy,
OBV_StringNode,
1);
dummy->name ((const char*)("RightNode"));
@@ -186,23 +186,23 @@ main (int argc, char *argv[])
// dummy->right (sn); // ;-)
}
}
-
+
// Dump the tree.
dump_tree (tc.in ());
- TreeController_var result_tc =
- test->reflect (tc.in () TAO_ENV_ARG_PARAMETER);
+ TreeController_var result_tc =
+ test->reflect (tc.in () ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
// Dump the resulting tree.
dump_tree (result_tc.in ());
- test->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+ test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test finished\n"));
- orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+ orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
diff --git a/TAO/tests/OBV/Forward/server.cpp b/TAO/tests/OBV/Forward/server.cpp
index afd06f22f66..f1935936260 100644
--- a/TAO/tests/OBV/Forward/server.cpp
+++ b/TAO/tests/OBV/Forward/server.cpp
@@ -43,56 +43,56 @@ main (int argc, char *argv[])
ACE_TRY_NEW_ENV
{
CORBA::ORB_var orb =
- CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
+ CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
// All factories are kindly provided by
// compiler so we just to put everything in a right order.
// Create and register factory for BaseNode.
- BaseNode_init *bn_factory = 0;
- ACE_NEW_RETURN (bn_factory,
+ BaseNode_init *bn_factory = 0;
+ ACE_NEW_RETURN (bn_factory,
BaseNode_init,
1);
orb->register_value_factory (bn_factory->tao_repository_id (),
bn_factory
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
bn_factory->_remove_ref (); // release ownership
// Create and register factory for TreeController.
- TreeController_init *tc_factory = 0;
- ACE_NEW_RETURN (tc_factory,
+ TreeController_init *tc_factory = 0;
+ ACE_NEW_RETURN (tc_factory,
TreeController_init,
1);
orb->register_value_factory (tc_factory->tao_repository_id (),
- tc_factory
- TAO_ENV_ARG_PARAMETER);
+ tc_factory
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
tc_factory->_remove_ref (); // release ownership
// Create and register factory for StringNode.
- StringNode_init *sn_factory = 0;
- ACE_NEW_RETURN (sn_factory,
+ StringNode_init *sn_factory = 0;
+ ACE_NEW_RETURN (sn_factory,
StringNode_init,
1);
orb->register_value_factory (sn_factory->tao_repository_id (),
- sn_factory
- TAO_ENV_ARG_PARAMETER);
+ sn_factory
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
sn_factory->_remove_ref (); // release ownership
//Well, done with factories.
CORBA::Object_var poa_object =
- orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+ orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
PortableServer::POA_var root_poa =
- PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+ PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (CORBA::is_nil (root_poa.in ()))
@@ -101,7 +101,7 @@ main (int argc, char *argv[])
1);
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+ root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
if (parse_args (argc, argv) != 0)
@@ -114,11 +114,11 @@ main (int argc, char *argv[])
PortableServer::ServantBase_var owner_transfer(test_impl);
- Test_var test = test_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ Test_var test = test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
CORBA::String_var ior =
- orb->object_to_string (test.in () TAO_ENV_ARG_PARAMETER);
+ orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
// If the ior_output_file exists, output the ior to it
@@ -131,18 +131,18 @@ main (int argc, char *argv[])
ACE_OS::fprintf (output_file, "%s", ior.in ());
ACE_OS::fclose (output_file);
- poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+ poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
- orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+ orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
- root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+ root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+ orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
View Lorry Controller Status