Thu Jul 31 12:41:11 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

4 files changed, 17 insertions, 15 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index f28e22ef69a..f4c130e8c9d 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,12 @@
+Thu Jul 31 12:41:11 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Portable_Interceptors/Bug_2133/client.cpp:
+        * tests/Portable_Interceptors/Bug_2510_Regression/client.cpp:
+          Wchar improvements
+
+        * tests/AMI_Timeouts/server.cpp:
+          Use prefix increment
+
 Wed Jul 30 18:41:27 UTC 2008  Ciju John  <johnc at ociweb dot com>
 
         * tests/Oneway_Send_Timeouts/Client.cpp:
diff --git a/TAO/tests/AMI_Timeouts/server.cpp b/TAO/tests/AMI_Timeouts/server.cpp
index 1030ca5378c..361a6679ddf 100644
--- a/TAO/tests/AMI_Timeouts/server.cpp
+++ b/TAO/tests/AMI_Timeouts/server.cpp
@@ -7,7 +7,6 @@
  *
  *  Implementation of the server running the Timeout object.
  *
- *
  *  @author Michael Kircher <Michael.Kircher@mchp.siemens.de>
  */
 //=============================================================================
@@ -36,7 +35,7 @@ parse_args (int argc, char *argv[])
         ior_output_file = get_opts.opt_arg ();
         break;
       case 'd':
-        TAO_debug_level++;
+        ++TAO_debug_level;
         break;
       case '?':
       default:
diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/client.cpp b/TAO/tests/Portable_Interceptors/Bug_2133/client.cpp
index 5a60833acba..f209babbf01 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2133/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2133/client.cpp
@@ -12,9 +12,9 @@ ACE_RCSID(Hello, client, "client.cpp,v 1.5 2002/01/29 20:21:07 okellogg Exp")
 const char *ior = "file://test.ior";
 
 int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:"));
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -55,9 +55,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv);
-
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -65,11 +63,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       CORBA::Object_var tmp =
         orb->string_to_object(ior );
 
-
       Test::Hello_var hello =
         Test::Hello::_narrow(tmp.in () );
 
-
       if (CORBA::is_nil (hello.in ()))
         {
           ACE_ERROR_RETURN ((LM_DEBUG,
@@ -83,7 +79,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       CORBA::String_var the_string =
         hello->get_string ();
 
-
       ACE_ERROR_RETURN ((LM_DEBUG,
                             "Error - the remote call succeeded which is bloody miraculous given that no server is running !!\n",
                              ior),
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp
index fee135d12db..1ed8737ded8 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp
@@ -12,9 +12,9 @@ ACE_RCSID(Bug_2510_Regression, client, "$Id$")
 const char *ior = "file://test.ior";
 
 int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "ef:");
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("ef:"));
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -68,11 +68,10 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
         PortableInterceptor::register_orb_initializer (initializer.in ());
 
-        CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv);
+        CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
         if (parse_args (argc, argv) != 0)
-        return 1;
+          return 1;
 
         CORBA::Object_var object =
         orb->string_to_object (ior);