Fri Nov 23 19:33:54 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

7 files changed, 27 insertions, 11 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 957406254fa..608c17ccb8e 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,23 @@
+Fri Nov 23 19:33:54 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Naming/Naming_Server.cpp:
+          Prefix increment
+
+        * orbsvcs/orbsvcs/SSLIOP.mpc:
+          Updated for vc9
+
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp:
+          Corrected debug statement
+
+        * tao/SystemException.cpp:
+          Prefix decrement
+
+        * tests/CodeSets/simple/client.cpp:
+          No need to pass an empty orb name
+
+        * tests/Param_Test/server.cpp:
+          Layout change
+
 Thu Nov 22 05:32:24 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
 
         * tests/Bug_1551_Regression/server.cpp:
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
index 640d8d11f4b..bdd28e58252 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
@@ -188,7 +188,7 @@ TAO_Naming_Server::parse_args (int argc,
     switch (c)
       {
       case 'd':  // debug flag.
-        TAO_debug_level++;
+        ++TAO_debug_level;
         break;
       case 'o': // outputs the naming service ior to a file.
         this->ior_file_name_ = get_opts.opt_arg ();
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP.mpc b/TAO/orbsvcs/orbsvcs/SSLIOP.mpc
index aeff911af87..c5052f37484 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP.mpc
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP.mpc
@@ -42,7 +42,7 @@ project(SSLIOP) : orbsvcslib, install, security, ssl, pi_server, interceptors, t
       ./SSLIOP/SSLIOP_Transport.cpp
       ./SSLIOP/SSLIOP_Util.cpp
       SSLIOPC.cpp
-      conditional(vc71, vc8) {
+      conditional(vc71, vc8, vc9) {
         ./SSLIOP/params_dup.cpp
       } else {
         ./SSLIOP/params_dup.c
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
index d87d423abb4..a1676199793 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
@@ -94,7 +94,7 @@ TAO::SSLIOP::Transport::recv (char *buf,
       && errno != ETIME)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) - %p \n"),
+                  ACE_TEXT ("TAO (%P|%t) - SSLIOP_Transport::recv, %p \n"),
                   ACE_TEXT ("TAO - read message failure ")
                   ACE_TEXT ("recv_i () \n")));
     }
diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp
index c2a8e88b54b..db2cf2fbb35 100644
--- a/TAO/tao/SystemException.cpp
+++ b/TAO/tao/SystemException.cpp
@@ -676,7 +676,7 @@ CORBA::SystemException::_tao_get_omg_exception_description (
   if (minor_code == 0)
     return "*unknown description*";
 
-  minor_code--;  // Adjust to match table offset.
+  --minor_code;  // Adjust to match table offset.
 
   CORBA::UNKNOWN const * unknown_exception =
     dynamic_cast <const CORBA::UNKNOWN *> (&exc);
diff --git a/TAO/tests/CodeSets/simple/client.cpp b/TAO/tests/CodeSets/simple/client.cpp
index 3a741b077c9..850cdc4664c 100644
--- a/TAO/tests/CodeSets/simple/client.cpp
+++ b/TAO/tests/CodeSets/simple/client.cpp
@@ -58,9 +58,7 @@ int main (int argc, char *argv[])
   try
     {
       // Init the orb
-      CORBA::ORB_var orb= CORBA::ORB_init (argc,
-                                           argv,
-                                           "");
+      CORBA::ORB_var orb= CORBA::ORB_init (argc, argv);
 
       // Get IOR from command line (or file)
       if (argc != 2)
diff --git a/TAO/tests/Param_Test/server.cpp b/TAO/tests/Param_Test/server.cpp
index 59de4d8d5ff..6dde3f0571a 100644
--- a/TAO/tests/Param_Test/server.cpp
+++ b/TAO/tests/Param_Test/server.cpp
@@ -154,11 +154,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       orb_ptr->run ();
 
-      good_poa->destroy (1,
-                         1);
+      good_poa->destroy (1, 1);
 
-      oa_ptr->destroy (1,
-                       1);
+      oa_ptr->destroy (1, 1);
     }
   catch (const CORBA::SystemException& sysex)
     {