Merged corba-env-clean branch.

3 files changed, 9 insertions, 9 deletions

diff --git a/TAO/orbsvcs/Trading_Service/Trading_Server.cpp b/TAO/orbsvcs/Trading_Service/Trading_Server.cpp
index 0e128784ca2..309df532cb9 100644
--- a/TAO/orbsvcs/Trading_Service/Trading_Server.cpp
+++ b/TAO/orbsvcs/Trading_Service/Trading_Server.cpp
@@ -12,12 +12,12 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       int check =
-        trader.init (argc, argv, ACE_TRY_ENV);
+        trader.init (argc, argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (check != -1)
         {
-          trader.run (ACE_TRY_ENV);
+          trader.run (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else
diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
index 423fad6ec41..00edb488e47 100644
--- a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
+++ b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
@@ -47,8 +47,8 @@ Trading_Service::~Trading_Service (void)
 
 int
 Trading_Service::init (int argc,
-                       char *argv[],
-                       CORBA::Environment &)
+                       char *argv[]
+                       TAO_ENV_ARG_DECL_NOT_USED)
 {
   int result_trader =
     this->trading_loader_.init (argc, argv);
@@ -60,12 +60,12 @@ Trading_Service::init (int argc,
 }
 
 int
-Trading_Service::run (CORBA::Environment &ACE_TRY_ENV)
+Trading_Service::run (TAO_ENV_SINGLE_ARG_DECL)
 {
   Trading_Shutdown trading_shutdown (*this);
 
   int return_value =
-    this->trading_loader_.run (ACE_TRY_ENV);
+    this->trading_loader_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return return_value;
diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.h b/TAO/orbsvcs/Trading_Service/Trading_Service.h
index 2bb42f91947..09cacc2af44 100644
--- a/TAO/orbsvcs/Trading_Service/Trading_Service.h
+++ b/TAO/orbsvcs/Trading_Service/Trading_Service.h
@@ -61,11 +61,11 @@ public:
   // Destructor
 
   int init (int argc,
-            char *argv[],
-            CORBA::Environment &ACE_TRY_ENV);
+            char *argv[]
+            TAO_ENV_ARG_DECL);
   // Initialize the Trading Service with arguments.
 
-  int run (CORBA::Environment &ACE_TRY_ENV);
+  int run (TAO_ENV_SINGLE_ARG_DECL);
   // Run the Trading Service.
 
   int shutdown (void);