Wed Jan 24 14:00:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

4 files changed, 6 insertions, 33 deletions

diff --git a/TAO/interop-tests/wchar/client.cpp b/TAO/interop-tests/wchar/client.cpp
index c7ebabb7368..fd798d30ef6 100644
--- a/TAO/interop-tests/wchar/client.cpp
+++ b/TAO/interop-tests/wchar/client.cpp
@@ -128,7 +128,6 @@ run_one_test (interop::WChar_Passer_ptr server,
         ACE_TRY_NEW_ENV
           {
             server->exception_test(data_set ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
           }
         ACE_CATCH (interop::WChar_Passer::WStringException, e)
           {
@@ -141,7 +140,6 @@ run_one_test (interop::WChar_Passer_ptr server,
       {
         CORBA::WChar wc = server->wchar_from_server (data_set
                                                      ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN(0);
         return ref.match_wchar (data_set,wc);
       }
     case WSTRING_FROM_SERVER:
@@ -149,7 +147,6 @@ run_one_test (interop::WChar_Passer_ptr server,
         CORBA::WString_var ws =
           server->wstring_from_server (data_set
                                        ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (0);
         return ref.match_wstring (data_set,ws.in());
       }
     case WARRAY_FROM_SERVER:
@@ -157,7 +154,6 @@ run_one_test (interop::WChar_Passer_ptr server,
         interop::warray_var wa =
           server->warray_from_server (data_set
                                       ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN(0);
         return ref.match_warray (data_set,wa.in());
       }
     case ANY_WCHAR_FROM_SERVER:
@@ -166,7 +162,6 @@ run_one_test (interop::WChar_Passer_ptr server,
         CORBA::Any_var test = server->any_from_server (data_set,
                                                        interop::is_wchar
                                                        ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN(0);
         if (test >>= CORBA::Any::to_wchar(wc))
           {
             return ref.match_wchar (data_set,wc);
@@ -186,7 +181,6 @@ run_one_test (interop::WChar_Passer_ptr server,
         CORBA::Any_var test = server->any_from_server (data_set,
                                                        interop::is_wstring
                                                        ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN(0);
         if (test >>= ws)
           {
             return ref.match_wstring (data_set,ws);
@@ -199,7 +193,6 @@ run_one_test (interop::WChar_Passer_ptr server,
         a <<= ref.get_wstring(data_set);
         const CORBA::WChar *ws;
         CORBA::Any_var test = server->any_echo (a ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN(0);
         if (test >>= ws)
           {
             return ref.match_wstring (data_set,ws);
@@ -210,7 +203,6 @@ run_one_test (interop::WChar_Passer_ptr server,
       {
         interop::wstructseq_var wsList =
           server->wstructseq_from_server(data_set ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN(0);
         int result = 1;
 
         for (CORBA::ULong i = 0; i < wsList->length(); i++)
@@ -251,7 +243,6 @@ run_tests (interop::WChar_Passer_ptr server ACE_ENV_ARG_DECL)
     if ((tests_to_run & t) == t)
       {
         CORBA::Boolean result = run_one_test (server,t ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN(0);
         ++numtests;
         if (result) ++successes;
         if (verbose)
@@ -334,7 +325,6 @@ ACE_TMAIN( int argc, ACE_TCHAR *argv[] )
 
     // Destringify ior
     CORBA::Object_var obj = orb->string_to_object( ACE_TEXT_ALWAYS_CHAR(ior) ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
     if( CORBA::is_nil( obj.in() ) )
       ACE_ERROR_RETURN ((LM_ERROR,
                          "arg is not a valid ior sting"),
@@ -343,7 +333,6 @@ ACE_TMAIN( int argc, ACE_TCHAR *argv[] )
     // Narrow
     interop::WChar_Passer_var server =
       interop::WChar_Passer::_narrow( obj.in() ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
 
     if( CORBA::is_nil( server.in() ))
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -351,18 +340,15 @@ ACE_TMAIN( int argc, ACE_TCHAR *argv[] )
                         -1);
 
     short result = run_tests (server.in() ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
     CORBA::String_var server_orb =
-      server->orb_name(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      server->orb_name();
     ACE_ERROR ((LM_ERROR,
                 "wchar_interop test (TAO client, %s server) %s \n",
                 server_orb.in(),
                 (result ? "passed" : "failed")));
     if (kill_server)
     {
-      server->shutdown(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown();
     }
   }
   ACE_CATCH(CORBA::Exception, ex)
diff --git a/TAO/interop-tests/wchar/interop_wchar_i.cpp b/TAO/interop-tests/wchar/interop_wchar_i.cpp
index 88aa05387ca..fdad0ebf491 100644
--- a/TAO/interop-tests/wchar/interop_wchar_i.cpp
+++ b/TAO/interop-tests/wchar/interop_wchar_i.cpp
@@ -38,7 +38,7 @@ interop_WChar_Passer_i::~interop_WChar_Passer_i (void)
 }
 
 char *
-interop_WChar_Passer_i::orb_name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+interop_WChar_Passer_i::orb_name (void)
     ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return CORBA::string_dup ("TAO");
@@ -115,9 +115,7 @@ interop_WChar_Passer_i::wstruct_from_server (CORBA::Short key
 {
   interop::wstruct_var ws = new interop::wstruct ();
   ws->st_char = this->wchar_from_server(key ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
   ws->st_string = this->wstring_from_server(key ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
   ref_.assign_warray (key, ws->st_array);
   ws->st_any <<= ref_.get_wstring(key);
   return ws._retn ();
@@ -133,7 +131,6 @@ interop_WChar_Passer_i::wstructseq_to_server (const interop::wstructseq & test,
   for (CORBA::ULong i = 0; result && i < test.length(); i++)
     {
       result = this->wstruct_to_server(test[i], key ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
     }
   return result;
 }
@@ -149,9 +146,7 @@ interop_WChar_Passer_i::wstructseq_from_server (CORBA::Short key
   for (CORBA::ULong i = 0; i < wsListI->length(); i++)
     {
       wsListI[i].st_char = this->wchar_from_server(key ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
       wsListI[i].st_string = this->wstring_from_server(key ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
       ref_.assign_warray (key, wsListI[i].st_array);
       // this is to keep Cxx on TRUE64 happy
       // it won't cast a wide character literal (i.e. L"")
@@ -273,7 +268,7 @@ interop_WChar_Passer_i::exception_test ( CORBA::Short key
 }
 
 void
-interop_WChar_Passer_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+interop_WChar_Passer_i::shutdown (void)
   ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   this->orb_->shutdown(0 ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/interop-tests/wchar/interop_wchar_i.h b/TAO/interop-tests/wchar/interop_wchar_i.h
index 395d1a89607..37b6b18469d 100644
--- a/TAO/interop-tests/wchar/interop_wchar_i.h
+++ b/TAO/interop-tests/wchar/interop_wchar_i.h
@@ -42,7 +42,7 @@ public:
   //Destructor
   virtual ~interop_WChar_Passer_i (void);
 
-  virtual char * orb_name (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * orb_name (void)
     ACE_THROW_SPEC (( CORBA::SystemException ));
 
   virtual CORBA::Boolean wchar_to_server (CORBA::WChar test,
@@ -119,7 +119,7 @@ virtual void exception_test (CORBA::Short key
   ACE_THROW_SPEC (( CORBA::SystemException,
                     interop::WChar_Passer::WStringException ));
 
-virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+virtual void shutdown (void)
   ACE_THROW_SPEC (( CORBA::SystemException ));
 
 private:
diff --git a/TAO/interop-tests/wchar/server.cpp b/TAO/interop-tests/wchar/server.cpp
index 8b464c4cbd5..f0fcb41d069 100644
--- a/TAO/interop-tests/wchar/server.cpp
+++ b/TAO/interop-tests/wchar/server.cpp
@@ -90,20 +90,16 @@ ACE_TMAIN( int argc, ACE_TCHAR *argv[] )
         CORBA::Object_var obj =
         orb->resolve_initial_references( "RootPOA"
                                          ACE_ENV_ARG_PARAMETER );
-        ACE_TRY_CHECK;
 
         PortableServer::POA_var poa =
           PortableServer::POA::_narrow( obj.in()
                                         ACE_ENV_ARG_PARAMETER );
-        ACE_TRY_CHECK;
 
         PortableServer::POAManager_var mgr =
           poa->the_POAManager( ACE_ENV_SINGLE_ARG_PARAMETER );
-        ACE_TRY_CHECK;
 
         // Activate POA Manager
         mgr->activate( ACE_ENV_SINGLE_ARG_PARAMETER );
-        ACE_TRY_CHECK;
 
         // Create an object
         interop_WChar_Passer_i servant(orb.in(), verbose);
@@ -112,12 +108,10 @@ ACE_TMAIN( int argc, ACE_TCHAR *argv[] )
         // reference, stringify it, and write it to a file.
         obj = poa->servant_to_reference( &servant
                                          ACE_ENV_ARG_PARAMETER );
-        ACE_TRY_CHECK;
 
         CORBA::String_var str =
           orb->object_to_string( obj.in()
                                  ACE_ENV_ARG_PARAMETER );
-        ACE_TRY_CHECK;
 
         FILE *output_file = ACE_OS::fopen (ior_output_file, ACE_TEXT("w"));
         if (output_file == 0)
@@ -131,9 +125,7 @@ ACE_TMAIN( int argc, ACE_TCHAR *argv[] )
 
         // Accept requests
         orb->run( ACE_ENV_SINGLE_ARG_PARAMETER );
-        ACE_TRY_CHECK;
         orb->destroy( ACE_ENV_SINGLE_ARG_PARAMETER );
-        ACE_TRY_CHECK;
       }
     ACE_CATCH(CORBA::Exception, ex)
       {