summaryrefslogtreecommitdiff
path: root/TAO/tests/Xt_Stopwatch
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tests/Xt_Stopwatch')
-rw-r--r--TAO/tests/Xt_Stopwatch/Client.h2
-rw-r--r--TAO/tests/Xt_Stopwatch/client.cpp20
-rw-r--r--TAO/tests/Xt_Stopwatch/server.cpp16
-rw-r--r--TAO/tests/Xt_Stopwatch/test_i.cpp6
-rw-r--r--TAO/tests/Xt_Stopwatch/test_i.h6
5 files changed, 25 insertions, 25 deletions
diff --git a/TAO/tests/Xt_Stopwatch/Client.h b/TAO/tests/Xt_Stopwatch/Client.h
index 0d116185253..e39fb418d95 100644
--- a/TAO/tests/Xt_Stopwatch/Client.h
+++ b/TAO/tests/Xt_Stopwatch/Client.h
@@ -49,7 +49,7 @@ public:
// Adds the callbacks to the GUI underneath.....
void parse_args (int argc, char *argv[]
- TAO_ENV_ARG_DECL);
+ ACE_ENV_ARG_DECL);
private:
CORBA::ORB_var orb_;
diff --git a/TAO/tests/Xt_Stopwatch/client.cpp b/TAO/tests/Xt_Stopwatch/client.cpp
index 58c06433cbd..f40fe31f222 100644
--- a/TAO/tests/Xt_Stopwatch/client.cpp
+++ b/TAO/tests/Xt_Stopwatch/client.cpp
@@ -38,17 +38,17 @@ main (int argc, char *argv[])
Control control (toplevel);
- TAO_ENV_DECLARE_NEW_ENV;
+ ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
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;
Client client (orb.in ());
- client.parse_args (argc, argv TAO_ENV_ARG_PARAMETER);
+ client.parse_args (argc, argv ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
client.add_callback (control);
@@ -79,7 +79,7 @@ Client::~Client (void)
void
Client::parse_args (int argc,
char *argv[]
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
{
const char *ior = "file://test.ior";
@@ -102,11 +102,11 @@ Client::parse_args (int argc,
}
CORBA::Object_var object =
- this->orb_->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+ this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
this->server_ =
- Stopwatch::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+ Stopwatch::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
if (CORBA::is_nil(this->server_.in ()))
@@ -157,10 +157,10 @@ Client::stop_callback (Widget /*widget*/,
void
Client::start_hook (void)
{
- TAO_ENV_DECLARE_NEW_ENV;
+ ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- this->server_->start (TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->server_->start (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -175,10 +175,10 @@ Client::start_hook (void)
void
Client::stop_hook (void)
{
- TAO_ENV_DECLARE_NEW_ENV;
+ ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- this->server_->stop (TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->server_->stop (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
diff --git a/TAO/tests/Xt_Stopwatch/server.cpp b/TAO/tests/Xt_Stopwatch/server.cpp
index 984aa6b5304..b02fa3f9951 100644
--- a/TAO/tests/Xt_Stopwatch/server.cpp
+++ b/TAO/tests/Xt_Stopwatch/server.cpp
@@ -72,16 +72,16 @@ main (int argc, char *argv[])
Stopwatch_display stopwatch (toplevel);
- TAO_ENV_DECLARE_NEW_ENV;
+ ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
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 ()))
@@ -90,11 +90,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;
stopwatch.manage ();
@@ -105,11 +105,11 @@ main (int argc, char *argv[])
Stopwatch_imp server_impl (orb.in (), &timer);
Stopwatch_var server =
- server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
CORBA::String_var ior =
- orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
+ orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -127,7 +127,7 @@ main (int argc, char *argv[])
ACE_OS::fclose (output_file);
}
- poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+ poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
XtRealizeWidget (toplevel);
diff --git a/TAO/tests/Xt_Stopwatch/test_i.cpp b/TAO/tests/Xt_Stopwatch/test_i.cpp
index 4b42f8473db..e224eb939df 100644
--- a/TAO/tests/Xt_Stopwatch/test_i.cpp
+++ b/TAO/tests/Xt_Stopwatch/test_i.cpp
@@ -17,21 +17,21 @@ Stopwatch_imp::Stopwatch_imp (CORBA::ORB_ptr orb, Timer_imp *timer)
}
void
-Stopwatch_imp::start (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Stopwatch_imp::start (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->timer_->start ();
}
void
-Stopwatch_imp::stop (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Stopwatch_imp::stop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->timer_->stop ();
}
void
-Stopwatch_imp::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Stopwatch_imp::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->orb_->shutdown (0);
diff --git a/TAO/tests/Xt_Stopwatch/test_i.h b/TAO/tests/Xt_Stopwatch/test_i.h
index 550d3c2390d..1450ca0a48b 100644
--- a/TAO/tests/Xt_Stopwatch/test_i.h
+++ b/TAO/tests/Xt_Stopwatch/test_i.h
@@ -34,13 +34,13 @@ public:
// ctor
// = The Simple_Server methods.
- void start (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void start (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException));
- void stop (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void stop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException));
- void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
View Lorry Controller Status