ChangeLog tag: Fri Jun 11 12:11:16 2004 Phil Mesnier <mesnier_p@ociweb.com>

10 files changed, 218 insertions, 116 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 630dc218327..9f86690fac1 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,21 @@
+Fri Jun 11 12:11:16 2004  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * interop-tests/wchar/client.cpp:
+        * interop-tests/wchar/interop_wchar_i.cpp:
+        * interop-tests/wchar/interop_wchar_i.h:
+        * interop-tests/wchar/server.cpp:
+          Added support for non-native exceptions.
+
+        * interop-tests/wchar/interop_wchar.mpc:
+        * tao/UTF16_BOM_Translator.h:
+        * tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp:
+        * tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.h:
+          Fixed fuzz reported issues.
+
+        * interop-tests/wchar/run_tests.pl:
+          Added argument to client command line causing server shutdown at
+          test completion.
+
 Fri Jun 11 13:49:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/RTCORBA/RTCORBAC.h:
diff --git a/TAO/interop-tests/wchar/client.cpp b/TAO/interop-tests/wchar/client.cpp
index c3d05e8bb67..4ba82f82bc4 100644
--- a/TAO/interop-tests/wchar/client.cpp
+++ b/TAO/interop-tests/wchar/client.cpp
@@ -62,51 +62,72 @@ wchar_reference ref;
 
 CORBA::Boolean
 run_one_test (interop::WChar_Passer_ptr server,
-              int test_num)
+              int test_num ACE_ENV_ARG_DECL)
 {
   switch (test_num)
     {
     case WCHAR_TO_SERVER:
-      return server->wchar_to_server (ref.get_wchar(data_set),data_set);
+      return server->wchar_to_server (ref.get_wchar(data_set),
+                                      data_set
+                                      ACE_ENV_ARG_PARAMETER);
     case WSTRING_TO_SERVER:
-      return server->wstring_to_server (ref.get_wstring(data_set),data_set);
+      return server->wstring_to_server (ref.get_wstring(data_set),
+                                        data_set
+                                        ACE_ENV_ARG_PARAMETER);
     case WARRAY_TO_SERVER:
-      return server->warray_to_server (ref.get_warray(data_set),data_set);
+      return server->warray_to_server (ref.get_warray(data_set),
+                                       data_set
+                                       ACE_ENV_ARG_PARAMETER);
     case ANY_WCHAR_TO_SERVER:
       {
         CORBA::Any a;
         a <<= CORBA::Any::from_wchar(ref.get_wchar(data_set));
-        return server->any_to_server (a,data_set);
+        return server->any_to_server (a,data_set ACE_ENV_ARG_PARAMETER);
       }
     case WSTRING_EXCEPTION:
       {
-        try {
-          server->exception_test(data_set);
-        } catch (interop::WChar_Passer::WStringException &e) {
-          return ref.match_except (data_set,e.why.in());
-        }
+        ACE_TRY_NEW_ENV
+          {
+            server->exception_test(data_set ACE_ENV_ARG_PARAMETER);
+            ACE_TRY_CHECK;
+          }
+        ACE_CATCH (interop::WChar_Passer::WStringException, e)
+          {
+            return ref.match_except (data_set,e.why.in());
+          }
+        ACE_ENDTRY;
         break;
       }
     case WCHAR_FROM_SERVER:
       {
-        CORBA::WChar wc = server->wchar_from_server (data_set);
+        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:
       {
-        CORBA::WString_var ws = server->wstring_from_server (data_set);
+        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:
       {
-        interop::warray_var wa = server->warray_from_server (data_set);
+        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:
       {
         CORBA::WChar wc;
         CORBA::Any_var test = server->any_from_server (data_set,
-                                                       interop::is_wchar);
+                                                       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);
@@ -117,13 +138,16 @@ run_one_test (interop::WChar_Passer_ptr server,
       {
         CORBA::Any a;
         a <<= ref.get_wstring(data_set);
-        return server->any_to_server (a,data_set);
+        return server->any_to_server (a,data_set
+                                      ACE_ENV_ARG_PARAMETER);
       }
     case ANY_WSTRING_FROM_SERVER:
       {
         const CORBA::WChar *ws;
         CORBA::Any_var test = server->any_from_server (data_set,
-                                                       interop::is_wstring);
+                                                       interop::is_wstring
+                                                       ACE_ENV_ARG_PARAMETER);
+        ACE_CHECK_RETURN(0);
         if (test >>= ws)
           {
             return ref.match_wstring (data_set,ws);
@@ -135,7 +159,8 @@ run_one_test (interop::WChar_Passer_ptr server,
         CORBA::Any a;
         a <<= ref.get_wstring(data_set);
         const CORBA::WChar *ws;
-        CORBA::Any_var test = server->any_echo (a);
+        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);
@@ -149,7 +174,7 @@ run_one_test (interop::WChar_Passer_ptr server,
 }
 
 short
-run_tests (interop::WChar_Passer_ptr server)
+run_tests (interop::WChar_Passer_ptr server ACE_ENV_ARG_DECL)
 {
   short successes = 0;
   short numtests = 0;
@@ -158,7 +183,8 @@ run_tests (interop::WChar_Passer_ptr server)
   for (int i = 0; i < LAST_TEST; i++, t <<= 1)
     if ((tests_to_run & t) == t)
       {
-        CORBA::Boolean result = run_one_test (server,t);
+        CORBA::Boolean result = run_one_test (server,t ACE_ENV_ARG_PARAMETER);
+        ACE_CHECK_RETURN(0);
         ++numtests;
         if (result) ++successes;
         if (verbose)
@@ -229,41 +255,50 @@ main( int argc, char *argv[] )
 #if (!defined ACE_HAS_WCHAR) && (!defined ACE_HAS_XPG4_MULTIBYTE_CHAR)
   ACE_ERROR_RETURN ((LM_ERROR,"This test requires wchar support\n"),-1);
 #else
-  try {
-    // Initialize orb
-    CORBA::ORB_var orb = CORBA::ORB_init( argc, argv );
-    if (parse_args(argc, argv) == -1)
-      return 0;
+  ACE_TRY_NEW_ENV
+    {
+      // Initialize orb
+      CORBA::ORB_var orb = CORBA::ORB_init( argc, argv);
+      if (parse_args(argc, argv) == -1)
+        return 0;
 
-    // Destringify ior
-    CORBA::Object_var obj = orb->string_to_object( ior );
-    if( CORBA::is_nil( obj.in() ) )
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "arg is not a valid ior sting"),
-                        -1);
+      // Destringify ior
+      CORBA::Object_var obj = orb->string_to_object( 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"),
+                          -1);
 
-    // Narrow
-    interop::WChar_Passer_var server =
-      interop::WChar_Passer::_narrow( obj.in() );
+      // 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,
-                         "arg is not a interop::WChar_Passer reference\n"),
-                        -1);
+      if( CORBA::is_nil( server.in() ))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "arg is not a interop::WChar_Passer reference\n"),
+                          -1);
 
-    short result = run_tests (server.in());
-    CORBA::String_var server_orb = 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();
-  }
-  catch( const CORBA::Exception &ex ) {
-    ACE_PRINT_EXCEPTION(ex, "Uncaught CORBA exception: ");
-    return 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;
+      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_CATCH(CORBA::Exception,ex)
+    {
+      ACE_PRINT_EXCEPTION(ex, "Uncaught CORBA exception: ");
+      return 1;
+    }
+  ACE_ENDTRY;
   return 0;
 #endif
 }
diff --git a/TAO/interop-tests/wchar/interop_wchar.mpc b/TAO/interop-tests/wchar/interop_wchar.mpc
index 0eca7aaab0b..569d1dcf7e7 100644
--- a/TAO/interop-tests/wchar/interop_wchar.mpc
+++ b/TAO/interop-tests/wchar/interop_wchar.mpc
@@ -1,3 +1,6 @@
+// -*- MPC -*-
+// $ID:$
+
 project(*Server): taoexe, portableserver {
   Source_Files {
     interop_wchar_i.cpp
diff --git a/TAO/interop-tests/wchar/interop_wchar_i.cpp b/TAO/interop-tests/wchar/interop_wchar_i.cpp
index b395b419880..e66c8c60da4 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 (void)
+interop_WChar_Passer_i::orb_name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return CORBA::string_dup ("TAO");
@@ -46,14 +46,16 @@ interop_WChar_Passer_i::orb_name (void)
 
 CORBA::Boolean
 interop_WChar_Passer_i::wchar_to_server (CORBA::WChar test,
-                                         CORBA::Short key)
+                                         CORBA::Short key
+                                         ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return ref_.match_wchar (key,test);
 }
 
 CORBA::WChar
-interop_WChar_Passer_i::wchar_from_server (CORBA::Short key)
+interop_WChar_Passer_i::wchar_from_server (CORBA::Short key
+                                           ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return ref_.get_wchar (key);
@@ -61,14 +63,16 @@ interop_WChar_Passer_i::wchar_from_server (CORBA::Short key)
 
 CORBA::Boolean
 interop_WChar_Passer_i::wstring_to_server (const CORBA::WChar * test,
-                                           CORBA::Short key)
+                                           CORBA::Short key
+                                           ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return ref_.match_wstring(key,test);
 }
 
 CORBA::WChar *
-interop_WChar_Passer_i::wstring_from_server (CORBA::Short key)
+interop_WChar_Passer_i::wstring_from_server (CORBA::Short key
+                                             ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return CORBA::wstring_dup (ref_.get_wstring(key));
@@ -76,14 +80,16 @@ interop_WChar_Passer_i::wstring_from_server (CORBA::Short key)
 
 CORBA::Boolean
 interop_WChar_Passer_i::warray_to_server (const interop::warray test,
-                                          CORBA::Short key)
+                                          CORBA::Short key
+                                          ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return ref_.match_warray(key,test);
 }
 
 interop::warray_slice *
-interop_WChar_Passer_i::warray_from_server (CORBA::Short key)
+interop_WChar_Passer_i::warray_from_server (CORBA::Short key
+                                            ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return interop::warray_dup (ref_.get_warray(key));
@@ -91,7 +97,8 @@ interop_WChar_Passer_i::warray_from_server (CORBA::Short key)
 
 CORBA::Boolean
 interop_WChar_Passer_i::wstruct_to_server (const interop::wstruct & test,
-                                           CORBA::Short key)
+                                           CORBA::Short key
+                                           ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return
@@ -102,7 +109,8 @@ interop_WChar_Passer_i::wstruct_to_server (const interop::wstruct & test,
 }
 
 interop::wstruct *
-interop_WChar_Passer_i::wstruct_from_server (CORBA::Short key)
+interop_WChar_Passer_i::wstruct_from_server (CORBA::Short key
+                                             ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   interop::wstruct *ws = new interop::wstruct ();
@@ -115,7 +123,8 @@ interop_WChar_Passer_i::wstruct_from_server (CORBA::Short key)
 
 CORBA::Boolean
 interop_WChar_Passer_i::wunion_to_server (const interop::wunion & test,
-                                          CORBA::Short key)
+                                          CORBA::Short key
+                                          ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   switch (test._d()) {
@@ -133,7 +142,8 @@ interop_WChar_Passer_i::wunion_to_server (const interop::wunion & test,
 
 interop::wunion *
 interop_WChar_Passer_i::wunion_from_server (CORBA::Short key,
-                                            interop::wchar_types type)
+                                            interop::wchar_types type
+                                            ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   interop::wunion *wu = new interop::wunion ();
@@ -154,7 +164,8 @@ interop_WChar_Passer_i::wunion_from_server (CORBA::Short key,
 
 CORBA::Boolean
 interop_WChar_Passer_i::any_to_server (const CORBA::Any &test,
-                                       CORBA::Short key)
+                                       CORBA::Short key
+                                       ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   CORBA::WChar wc;
@@ -179,7 +190,8 @@ interop_WChar_Passer_i::any_to_server (const CORBA::Any &test,
 
 CORBA::Any*
 interop_WChar_Passer_i::any_from_server (CORBA::Short key,
-                                         interop::wchar_types type)
+                                         interop::wchar_types type
+                                         ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   CORBA::Any *any = new CORBA::Any;
@@ -201,25 +213,26 @@ interop_WChar_Passer_i::any_from_server (CORBA::Short key,
 }
 
 CORBA::Any *
-interop_WChar_Passer_i::any_echo (const CORBA::Any &test)
+interop_WChar_Passer_i::any_echo (const CORBA::Any &test
+                                  ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return new CORBA::Any (test);
 }
 
 void
-interop_WChar_Passer_i::exception_test ( CORBA::Short key )
+interop_WChar_Passer_i::exception_test ( CORBA::Short key
+                                         ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    interop::WChar_Passer::WStringException))
 {
-  interop::WChar_Passer::WStringException ex(ref_.get_except(key),
-                                             this->wchar_from_server(key));
-  throw ex;
+  ACE_THROW (interop::WChar_Passer::WStringException(ref_.get_except(key),
+                                             this->wchar_from_server(key)));
 }
 
 void
-interop_WChar_Passer_i::shutdown ( )
+interop_WChar_Passer_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC (( CORBA::SystemException ))
 {
-  this->orb_->shutdown(0);
+  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 ae8aecbade5..261076c08e0 100644
--- a/TAO/interop-tests/wchar/interop_wchar_i.h
+++ b/TAO/interop-tests/wchar/interop_wchar_i.h
@@ -42,61 +42,75 @@ public:
   //Destructor
   virtual ~interop_WChar_Passer_i (void);
 
-  virtual char * orb_name (void)
+  virtual char * orb_name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC (( CORBA::SystemException ));
 
-  virtual CORBA::Boolean wchar_to_server ( CORBA::WChar test,
-                                           CORBA::Short key )
+  virtual CORBA::Boolean wchar_to_server (CORBA::WChar test,
+                                          CORBA::Short key
+                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC (( CORBA::SystemException ));
 
-  virtual CORBA::WChar wchar_from_server ( CORBA::Short key )
+  virtual CORBA::WChar wchar_from_server (CORBA::Short key
+                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC (( CORBA::SystemException ));
 
-  virtual CORBA::Boolean wstring_to_server ( const CORBA::WChar * test,
-                                             CORBA::Short key )
+  virtual CORBA::Boolean wstring_to_server (const CORBA::WChar * test,
+                                            CORBA::Short key
+                                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC (( CORBA::SystemException ));
 
-  virtual CORBA::WChar * wstring_from_server ( CORBA::Short key )
+  virtual CORBA::WChar * wstring_from_server (CORBA::Short key
+                                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC (( CORBA::SystemException ));
 
   virtual CORBA::Boolean warray_to_server (const interop::warray test,
-                                           CORBA::Short key )
+                                           CORBA::Short key
+                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC (( CORBA::SystemException ));
 
-  virtual interop::warray_slice * warray_from_server ( CORBA::Short key )
+  virtual interop::warray_slice * warray_from_server (CORBA::Short key
+                                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC (( CORBA::SystemException ));
 
   virtual CORBA::Boolean wstruct_to_server (const interop::wstruct & test,
-                                            CORBA::Short key)
+                                            CORBA::Short key
+                                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC (( CORBA::SystemException ));
 
-  virtual interop::wstruct * wstruct_from_server (CORBA::Short key)
+  virtual interop::wstruct * wstruct_from_server (CORBA::Short key
+                                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC (( CORBA::SystemException ));
 
   virtual CORBA::Boolean wunion_to_server (const interop::wunion & test,
-                                           CORBA::Short key)
+                                           CORBA::Short key
+                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC (( CORBA::SystemException ));
 
   virtual interop::wunion * wunion_from_server (CORBA::Short key,
-                                                interop::wchar_types type)
+                                                interop::wchar_types type
+                                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC (( CORBA::SystemException ));
 
   virtual CORBA::Boolean any_to_server (const CORBA::Any &test,
-                                        CORBA::Short key)
+                                        CORBA::Short key
+                                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
   ACE_THROW_SPEC (( CORBA::SystemException ));
 
   virtual CORBA::Any* any_from_server (CORBA::Short key,
-                                      interop::wchar_types type)
+                                       interop::wchar_types type
+                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
   ACE_THROW_SPEC (( CORBA::SystemException ));
 
-  virtual CORBA::Any* any_echo (const CORBA::Any &test)
+  virtual CORBA::Any* any_echo (const CORBA::Any &test
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
   ACE_THROW_SPEC (( CORBA::SystemException ));
 
-virtual void exception_test (CORBA::Short key)
+virtual void exception_test (CORBA::Short key
+                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
   ACE_THROW_SPEC (( CORBA::SystemException,
                     interop::WChar_Passer::WStringException ));
 
-virtual void shutdown ()
+virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
   ACE_THROW_SPEC (( CORBA::SystemException ));
 
 private:
diff --git a/TAO/interop-tests/wchar/run_test.pl b/TAO/interop-tests/wchar/run_test.pl
index 99cd6ccf720..337821792e8 100755
--- a/TAO/interop-tests/wchar/run_test.pl
+++ b/TAO/interop-tests/wchar/run_test.pl
@@ -13,7 +13,7 @@ unlink $iorfile;
 $status = 0;
 
 $SV = new PerlACE::Process ("server", "-o $iorfile");
-$CL = new PerlACE::Process ("client", "-k file://$iorfile");
+$CL = new PerlACE::Process ("client", "-k file://$iorfile -x");
 
 $SV->Spawn ();
 
diff --git a/TAO/interop-tests/wchar/server.cpp b/TAO/interop-tests/wchar/server.cpp
index b89d797c497..3f43f673417 100644
--- a/TAO/interop-tests/wchar/server.cpp
+++ b/TAO/interop-tests/wchar/server.cpp
@@ -21,7 +21,7 @@
 #include <ace/streams.h>
 #include <ace/Get_Opt.h>
 
-const char *ior_output_file = "IOR";
+const ACE_TCHAR *ior_output_file = ACE_TEXT("IOR");
 int verbose = 0;
 
 int
@@ -57,55 +57,74 @@ int
 main( int argc, char *argv[] )
 {
   if (parse_args(argc, argv))
-    ACE_ERROR_RETURN ((LM_ERROR, "failed to parse args\n"), 1);
-  try
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT("failed to parse args\n")), 1);
+  ACE_DECLARE_NEW_ENV;
+  ACE_TRY
     {
       // Initialize orb
       CORBA::ORB_var orb = CORBA::ORB_init( argc, argv );
-
       //Get reference to Root POA
-      CORBA::Object_var obj = orb->resolve_initial_references( "RootPOA" );
-      PortableServer::POA_var poa = PortableServer::POA::_narrow( obj.in() );
+      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();
+      PortableServer::POAManager_var mgr =
+        poa->the_POAManager( ACE_ENV_SINGLE_ARG_PARAMETER );
+      ACE_TRY_CHECK;
 
       // Activate POA Manager
-      mgr->activate();
+      mgr->activate( ACE_ENV_SINGLE_ARG_PARAMETER );
+      ACE_TRY_CHECK;
 
       // Create an object
       interop_WChar_Passer_i servant(orb.in(), verbose);
 
       // Register the servant with the RootPOA, obtain its object
       // reference, stringify it, and write it to a file.
-      obj = poa->servant_to_reference( &servant );
+      obj = poa->servant_to_reference( &servant
+                                       ACE_ENV_ARG_PARAMETER );
+      ACE_TRY_CHECK;
 
-      CORBA::String_var str = orb->object_to_string( obj.in() );
+      CORBA::String_var str =
+        orb->object_to_string( obj.in()
+                               ACE_ENV_ARG_PARAMETER );
+      ACE_TRY_CHECK;
 
       if (parse_args(argc, argv))
         {
           ACE_ERROR_RETURN ((LM_ERROR,
-                             "failed to parse args"),
+                             ACE_TEXT("failed to parse args\n")),
                             1);
         }
 
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      FILE *output_file = ACE_OS::fopen (ior_output_file, ACE_TEXT("w"));
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file for writing IOR: %s",
+                           ACE_TEXT("Cannot open output file ")
+                           ACE_TEXT("for writing IOR: %s"),
                            ior_output_file),
                           1);
       ACE_OS::fprintf (output_file, "%s", str.in ());
       ACE_OS::fclose (output_file);
 
       // Accept requests
-      orb->run();
-      orb->destroy();
+      orb->run( ACE_ENV_SINGLE_ARG_PARAMETER );
+      ACE_TRY_CHECK;
+      orb->destroy( ACE_ENV_SINGLE_ARG_PARAMETER );
+      ACE_TRY_CHECK;
     }
-
-    catch( const CORBA::Exception &ex ) {
+  ACE_CATCH(CORBA::Exception,ex)
+    {
       ACE_PRINT_EXCEPTION(ex, "uncaught exception");
       return 1;
     }
+  ACE_ENDTRY;
 
     return 0;
 }
diff --git a/TAO/tao/UTF16_BOM_Translator.h b/TAO/tao/UTF16_BOM_Translator.h
index 1be88977e07..88602c0f3ba 100644
--- a/TAO/tao/UTF16_BOM_Translator.h
+++ b/TAO/tao/UTF16_BOM_Translator.h
@@ -2,7 +2,7 @@
 
 //=============================================================================
 /**
- *  @file    Wchar_UCS4_UTC16_Translator.h
+ *  @file  UTF16_BOM_Translator.h
  *
  *  $Id$
  *
@@ -14,7 +14,7 @@
 
 #ifndef UTF16_BOM_TRANSLATOR_H
 #define UTF16_BOM_TRANSLATOR_H
-#include "ace/pre.h"
+#include /**/ "ace/pre.h"
 
 #include "ace/config-all.h"
 
@@ -30,7 +30,7 @@
 /**
  * @class UTF16_BOM_Translator
  *
- * @brief Codeset translation specialization.
+ * @brief Codeset translation specialization - Manages Byte Order Marker
  *
  * This class performs the codeset translation:
  *   - Native:        UTF16 (i.e. Unicode)
@@ -81,5 +81,5 @@ private:
 
 };
 
-#include "ace/post.h"
+#include /**/ "ace/post.h"
 #endif /* UTF16_BOM_TRANSLATOR_H */
diff --git a/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp b/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp
index 6af456c9406..40677ac0275 100644
--- a/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp
+++ b/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp
@@ -78,7 +78,7 @@ static const unsigned short ACE_UNICODE_BOM_SWAPPED = 0xFFFEU;
 
 /// load next two bytes from buffer into a short. Byte swapping as necessary
 static
-ACE_INLINE
+//ACE_INLINE
 ACE_UTF16_T
 load_raw_wchar (const char * buffer, size_t & pos, int do_byte_swap)
 {
@@ -99,7 +99,7 @@ load_raw_wchar (const char * buffer, size_t & pos, int do_byte_swap)
 
 /// convert UTF-16 surrogate pair to wchar_t
 static
-ACE_INLINE
+//ACE_INLINE
 ACE_CDR::WChar
 convert_surrogate_pair (ACE_UTF16_T high, ACE_UTF16_T low)
 {
@@ -114,7 +114,7 @@ convert_surrogate_pair (ACE_UTF16_T high, ACE_UTF16_T low)
 /// converts surrogate pairs
 /// substitutes SUBSTITUTE_CHAR for bad encoding
 static
-ACE_INLINE
+//ACE_INLINE
 ACE_CDR::WChar
 load_wchar (const char * buffer, size_t & pos, size_t length, int do_byte_swap)
 {
@@ -159,7 +159,7 @@ load_wchar (const char * buffer, size_t & pos, size_t length, int do_byte_swap)
 }
 
 static
-ACE_INLINE
+//ACE_INLINE
 size_t encode_utf16 (ACE_UTF16_T * buffer, ACE_CDR::WChar value)
 {
   buffer[0] = ACE_static_cast (ACE_UTF16_T, value);
diff --git a/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.h b/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.h
index a71fea1e927..1abb0521989 100644
--- a/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.h
+++ b/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.h
@@ -14,7 +14,7 @@
 
 #ifndef WUCS4_UTF16_H
 #define WUCS4_UTF16_H
-#include "ace/pre.h"
+#include /**/ "ace/pre.h"
 
 #include "ace/config-all.h"
 
@@ -88,5 +88,5 @@ private:
 
 };
 
-#include "ace/post.h"
+#include /**/ "ace/post.h"
 #endif /* WCHAR_UCS4_UTF16_TRANSLATOR */