summaryrefslogtreecommitdiff
path: root/TAO/tests/Big_Reply
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tests/Big_Reply')
-rw-r--r--TAO/tests/Big_Reply/Big_Reply_i.cpp6
-rw-r--r--TAO/tests/Big_Reply/Big_Reply_i.h6
-rw-r--r--TAO/tests/Big_Reply/Client_Task.cpp4
-rw-r--r--TAO/tests/Big_Reply/client.cpp8
-rw-r--r--TAO/tests/Big_Reply/server.cpp16
5 files changed, 20 insertions, 20 deletions
diff --git a/TAO/tests/Big_Reply/Big_Reply_i.cpp b/TAO/tests/Big_Reply/Big_Reply_i.cpp
index 58960000cef..40b9cca6846 100644
--- a/TAO/tests/Big_Reply/Big_Reply_i.cpp
+++ b/TAO/tests/Big_Reply/Big_Reply_i.cpp
@@ -14,7 +14,7 @@ Big_Reply_i::~Big_Reply_i (void)
}
Test::Octet_Seq *
-Big_Reply_i::get_big_reply (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+Big_Reply_i::get_big_reply (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
ACE_THROW_SPEC ((CORBA::SystemException))
{
Test::Octet_Seq_var reply_mesg =
@@ -26,13 +26,13 @@ Big_Reply_i::get_big_reply (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_AR
}
void
-Big_Reply_i::ping (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+Big_Reply_i::ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
void
-Big_Reply_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+Big_Reply_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->orb_->shutdown ();
diff --git a/TAO/tests/Big_Reply/Big_Reply_i.h b/TAO/tests/Big_Reply/Big_Reply_i.h
index ab73819e6e3..69edbcbe236 100644
--- a/TAO/tests/Big_Reply/Big_Reply_i.h
+++ b/TAO/tests/Big_Reply/Big_Reply_i.h
@@ -40,13 +40,13 @@ public:
virtual ~Big_Reply_i (void);
// = The skeleton methods
- virtual Test::Octet_Seq *get_big_reply (TAO_ENV_SINGLE_ARG_DECL)
+ virtual Test::Octet_Seq *get_big_reply (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void ping (TAO_ENV_SINGLE_ARG_DECL)
+ virtual void ping (ACE_ENV_SINGLE_ARG_DECL)
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/Big_Reply/Client_Task.cpp b/TAO/tests/Big_Reply/Client_Task.cpp
index ff78b52259f..2a979dede09 100644
--- a/TAO/tests/Big_Reply/Client_Task.cpp
+++ b/TAO/tests/Big_Reply/Client_Task.cpp
@@ -31,7 +31,7 @@ Client_Task::svc (void)
{
for (int i = 0; i != this->event_count_; ++i)
{
- this->reply_gen_->get_big_reply (TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->reply_gen_->get_big_reply (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
}
@@ -63,7 +63,7 @@ Client_Task::validate_connection (void)
ACE_TRY
{
- this->reply_gen_->ping (TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->reply_gen_->ping (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY {}
diff --git a/TAO/tests/Big_Reply/client.cpp b/TAO/tests/Big_Reply/client.cpp
index 2ada7182cf3..803b5db7e89 100644
--- a/TAO/tests/Big_Reply/client.cpp
+++ b/TAO/tests/Big_Reply/client.cpp
@@ -38,18 +38,18 @@ 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;
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::Big_Reply_var reply_gen =
- Test::Big_Reply::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
+ Test::Big_Reply::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (CORBA::is_nil (reply_gen.in ()))
@@ -73,7 +73,7 @@ main (int argc, char *argv[])
ACE_DEBUG ((LM_DEBUG, "Got all the replies...\n"));
- orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+ orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
diff --git a/TAO/tests/Big_Reply/server.cpp b/TAO/tests/Big_Reply/server.cpp
index e00ea261bfc..9aa133ddf4f 100644
--- a/TAO/tests/Big_Reply/server.cpp
+++ b/TAO/tests/Big_Reply/server.cpp
@@ -43,11 +43,11 @@ 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;
if (CORBA::is_nil (poa_object.in ()))
@@ -56,11 +56,11 @@ main (int argc, char *argv[])
1);
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;
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;
@@ -78,12 +78,12 @@ main (int argc, char *argv[])
PortableServer::ServantBase_var big_reply_owner_transfer(big_reply_gen);
Test::Big_Reply_var big_reply =
- big_reply_gen->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ big_reply_gen->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
CORBA::String_var ior =
orb->object_to_string (big_reply.in ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
// If the ior_output_file exists, output the ior to it
@@ -96,13 +96,13 @@ 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 ();
ACE_DEBUG ((LM_DEBUG, "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;
}
ACE_CATCHANY
View Lorry Controller Status