Merged corba-env-clean branch.

4 files changed, 41 insertions, 41 deletions

diff --git a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp
index 6c856fe1cab..80af10cfde4 100644
--- a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp
+++ b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp
@@ -12,8 +12,8 @@ Blocking_Sync_None::Blocking_Sync_None (CORBA::ORB_ptr orb)
 
 void
 Blocking_Sync_None::slow_operation (const Test::Payload &,
-                                    CORBA::ULong sleep_microseconds,
-                                    CORBA::Environment &)
+                                    CORBA::ULong sleep_microseconds
+                                    TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Time_Value sleep_time (0, sleep_microseconds);
@@ -21,8 +21,8 @@ Blocking_Sync_None::slow_operation (const Test::Payload &,
 }
 
 void
-Blocking_Sync_None::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Blocking_Sync_None::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h
index a7ac6065f56..8e970e76ee4 100644
--- a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h
+++ b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h
@@ -26,11 +26,11 @@ public:
 
   // = The skeleton methods
   virtual void slow_operation (const Test::Payload &the_payload,
-                               CORBA::ULong sleep_microseconds,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::ULong sleep_microseconds
+                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Blocking_Sync_None/client.cpp b/TAO/tests/Blocking_Sync_None/client.cpp
index 72ac3fcc768..0a10da916d4 100644
--- a/TAO/tests/Blocking_Sync_None/client.cpp
+++ b/TAO/tests/Blocking_Sync_None/client.cpp
@@ -19,19 +19,19 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'k':
-	ior = get_opts.optarg;
-	break;
+        ior = get_opts.optarg;
+        break;
 
       case 'i':
-	iterations = ACE_OS::atoi (get_opts.optarg);
-	break;
+        iterations = ACE_OS::atoi (get_opts.optarg);
+        break;
 
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-k <ior> "
-			   "-i <iterations> "
+                           "-k <ior> "
+                           "-i <iterations> "
                            "\n",
                            argv [0]),
                           -1);
@@ -46,18 +46,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior, ACE_TRY_ENV);
+        orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Blocking_Sync_None_var blocking_sync_none =
-        Test::Blocking_Sync_None::_narrow(tmp.in (), ACE_TRY_ENV);
+        Test::Blocking_Sync_None::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (blocking_sync_none.in ()))
@@ -67,11 +67,11 @@ main (int argc, char *argv[])
                           1);
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("PolicyCurrent", ACE_TRY_ENV);
+        orb->resolve_initial_references ("PolicyCurrent" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::PolicyCurrent_var policy_current =
-        CORBA::PolicyCurrent::_narrow (object.in (), ACE_TRY_ENV);
+        CORBA::PolicyCurrent::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (policy_current.in ()))
@@ -85,15 +85,15 @@ main (int argc, char *argv[])
       CORBA::PolicyList policies(1); policies.length (1);
       policies[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                            scope_as_any,
-                            ACE_TRY_ENV);
+                            scope_as_any
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE,
-                                            ACE_TRY_ENV);
+      policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      policies[0]->destroy (ACE_TRY_ENV);
+      policies[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       const int payload_length = 65536;
@@ -110,8 +110,8 @@ main (int argc, char *argv[])
           ACE_Time_Value start = ACE_OS::gettimeofday ();
 
           blocking_sync_none->slow_operation (payload,
-                                              sleep_microseconds,
-                                              ACE_TRY_ENV);
+                                              sleep_microseconds
+                                              TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_Time_Value elapsed = ACE_OS::gettimeofday ();
@@ -123,10 +123,10 @@ main (int argc, char *argv[])
             }
         }
 
-      blocking_sync_none->shutdown (ACE_TRY_ENV);
+      blocking_sync_none->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (blocked_calls > iterations / 20)
diff --git a/TAO/tests/Blocking_Sync_None/server.cpp b/TAO/tests/Blocking_Sync_None/server.cpp
index cd20f410a85..87bed6de345 100644
--- a/TAO/tests/Blocking_Sync_None/server.cpp
+++ b/TAO/tests/Blocking_Sync_None/server.cpp
@@ -17,14 +17,14 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_output_file = get_opts.optarg;
-	break;
+        ior_output_file = get_opts.optarg;
+        break;
 
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-o <iorfile>"
+                           "-o <iorfile>"
                            "\n",
                            argv [0]),
                           -1);
@@ -39,15 +39,15 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_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 (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -69,11 +69,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(blocking_sync_none_impl);
 
       Test::Blocking_Sync_None_var blocking_sync_none =
-        blocking_sync_none_impl->_this (ACE_TRY_ENV);
+        blocking_sync_none_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-	orb->object_to_string (blocking_sync_none.in (), ACE_TRY_ENV);
+        orb->object_to_string (blocking_sync_none.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -82,22 +82,22 @@ main (int argc, char *argv[])
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Cannot open output file for writing IOR: %s",
                            ior_output_file),
-			      1);
+                              1);
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY