summaryrefslogtreecommitdiff
path: root/TAO/tests/DLL_ORB
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tests/DLL_ORB')
-rw-r--r--TAO/tests/DLL_ORB/Test_Client_Module.cpp18
-rw-r--r--TAO/tests/DLL_ORB/Test_Server_Module.cpp24
-rw-r--r--TAO/tests/DLL_ORB/Test_i.cpp6
-rw-r--r--TAO/tests/DLL_ORB/Test_i.h4
4 files changed, 26 insertions, 26 deletions
diff --git a/TAO/tests/DLL_ORB/Test_Client_Module.cpp b/TAO/tests/DLL_ORB/Test_Client_Module.cpp
index 5496c07f1fa..02dba7c117c 100644
--- a/TAO/tests/DLL_ORB/Test_Client_Module.cpp
+++ b/TAO/tests/DLL_ORB/Test_Client_Module.cpp
@@ -63,7 +63,7 @@ Test_Client_Module::init (int argc, ACE_TCHAR *argv[])
// -----------------------------------------------------------------
// Boilerplate CORBA/TAO client-side ORB initialization code.
// -----------------------------------------------------------------
- TAO_ENV_DECLARE_NEW_ENV;
+ ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
// Prepend a "dummy" program name argument to the Service
@@ -88,7 +88,7 @@ Test_Client_Module::init (int argc, ACE_TCHAR *argv[])
this->orb_ = CORBA::ORB_init (new_argc,
new_argv.get_buffer (),
""
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (CORBA::is_nil (this->orb_.in ()))
@@ -98,11 +98,11 @@ Test_Client_Module::init (int argc, ACE_TCHAR *argv[])
return 1;
CORBA::Object_var obj =
- this->orb_->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+ this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
this->test_ =
- Test::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+ Test::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (CORBA::is_nil (this->test_.in ()))
@@ -139,13 +139,13 @@ Test_Client_Module::init (int argc, ACE_TCHAR *argv[])
int
Test_Client_Module::fini (void)
{
- TAO_ENV_DECLARE_NEW_ENV;
+ ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
// Make sure the ORB is destroyed.
if (!CORBA::is_nil (this->orb_.in ()))
{
- this->orb_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
}
@@ -184,15 +184,15 @@ Test_Client_Module::fini (void)
int
Test_Client_Module::svc (void)
{
- TAO_ENV_DECLARE_NEW_ENV;
+ ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
// Invoke an operation on the Test object.
- this->test_->invoke_me (TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->test_->invoke_me (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
/// Shutdown the remote ORB.
- this->test_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->test_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
diff --git a/TAO/tests/DLL_ORB/Test_Server_Module.cpp b/TAO/tests/DLL_ORB/Test_Server_Module.cpp
index aae697c0b63..f3d0d850cff 100644
--- a/TAO/tests/DLL_ORB/Test_Server_Module.cpp
+++ b/TAO/tests/DLL_ORB/Test_Server_Module.cpp
@@ -64,7 +64,7 @@ Test_Server_Module::init (int argc, ACE_TCHAR *argv[])
// -----------------------------------------------------------------
// Boilerplate CORBA/TAO server-side ORB initialization code.
// -----------------------------------------------------------------
- TAO_ENV_DECLARE_NEW_ENV;
+ ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
// Add one to the new argc since "dummy" is being added to the
@@ -89,14 +89,14 @@ Test_Server_Module::init (int argc, ACE_TCHAR *argv[])
this->orb_ = CORBA::ORB_init (new_argc,
new_argv.get_buffer (),
0
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (CORBA::is_nil (this->orb_.in ()))
return -1;
CORBA::Object_var poa_object =
- this->orb_->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+ this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (CORBA::is_nil (poa_object.in ()))
@@ -105,23 +105,23 @@ Test_Server_Module::init (int argc, ACE_TCHAR *argv[])
1);
this->poa_ =
- PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+ PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- this->poa_manager_ = this->poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->poa_manager_ = this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
- this->poa_manager_->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
if (::parse_args (new_argc, new_argv.get_buffer ()) != 0)
return -1;
- CORBA::Object_var obj = this->servant_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ CORBA::Object_var obj = this->servant_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
CORBA::String_var ior =
- this->orb_->object_to_string (obj.in () TAO_ENV_ARG_PARAMETER);
+ this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG,
@@ -166,13 +166,13 @@ Test_Server_Module::init (int argc, ACE_TCHAR *argv[])
int
Test_Server_Module::fini (void)
{
- TAO_ENV_DECLARE_NEW_ENV;
+ ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
// Make sure the ORB is destroyed.
if (!CORBA::is_nil (this->orb_.in ()))
{
- this->orb_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
}
@@ -202,11 +202,11 @@ Test_Server_Module::fini (void)
int
Test_Server_Module::svc (void)
{
- TAO_ENV_DECLARE_NEW_ENV;
+ ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
// Run the ORB event loop in its own thread.
- this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
diff --git a/TAO/tests/DLL_ORB/Test_i.cpp b/TAO/tests/DLL_ORB/Test_i.cpp
index f5ee66fd980..aa8d19ec17b 100644
--- a/TAO/tests/DLL_ORB/Test_i.cpp
+++ b/TAO/tests/DLL_ORB/Test_i.cpp
@@ -12,7 +12,7 @@ Test_i::Test_i (void)
}
void
-Test_i::invoke_me (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+Test_i::invoke_me (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_DEBUG ((LM_INFO,
@@ -20,14 +20,14 @@ Test_i::invoke_me (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAME
}
void
-Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_DEBUG ((LM_INFO,
"Server is shutting down.\n"));
if (!CORBA::is_nil (this->orb_.in ()))
- this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+ this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
}
void
diff --git a/TAO/tests/DLL_ORB/Test_i.h b/TAO/tests/DLL_ORB/Test_i.h
index b0f6ddb293a..9452bce731f 100644
--- a/TAO/tests/DLL_ORB/Test_i.h
+++ b/TAO/tests/DLL_ORB/Test_i.h
@@ -34,11 +34,11 @@ public:
/// Simple two-way operation used to excercise the ORB transport
/// internals.
- virtual void invoke_me (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void invoke_me (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Shutdown the ORB.
- 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));
/// Set the ORB to be shutdown by the shutdown() method in this
View Lorry Controller Status