Wed Nov 30 15:55:22 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>

        * orbsvcs/tests/Bug_2285_Regression/Hello.cpp:
        * orbsvcs/tests/Bug_2285_Regression/client2.cpp:
          Code cleanup

        * tests/Mixed_Sync_ASync_Events/main.cpp:
        * tests/Mixed_Sync_ASync_Events/test_i.cpp:
          Fixed LynxOS compile warnings

5 files changed, 19 insertions, 12 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index a22dbec7709..b92614ffcc8 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,19 +1,29 @@
+Wed Nov 30 15:55:22 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/Bug_2285_Regression/Hello.cpp:
+        * orbsvcs/tests/Bug_2285_Regression/client2.cpp:
+          Code cleanup
+
+        * tests/Mixed_Sync_ASync_Events/main.cpp:
+        * tests/Mixed_Sync_ASync_Events/test_i.cpp:
+          Fixed LynxOS compile warnings
+
 Tue Nov 29 15:50:06 UTC 2011  Martin Corino  <mcorino@remedy.nl>
 
         * tao/ORB_Core.cpp:
         * tao/params.h:
         * tao/params.inl:
         * tao/params.cpp:
-        
+
           Added -ORBUseHighresTimer ORB parameter switch to specifiy
           if the ORB should use the HR timer for the reactor timer queue
-          and related objects (like countdowns). 
+          and related objects (like countdowns).
 
         * tao/Transport.cpp:
         * tao/Leader_Follower.cpp:
         * tao/Messaging/Messaging_Queueing_Strategies.h:
         * tao/Messaging/Messaging_Queueing_Strategies.cpp:
-        
+
           Changes to support the new UseHighresTimer switch.
 
 Tue Nov 29 14:07:11 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp
index 8814ead3a6c..8414a6d3d2c 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp
@@ -3,10 +3,8 @@
 //
 #include "Hello.h"
 
-
-
 CORBA::Boolean
-Hello::ids_differ_ = 1;
+Hello::ids_differ_ = true;
 
 Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr server, CORBA::ULong server_id)
   : orb_ (CORBA::ORB::_duplicate (orb)),
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp
index 8f46138e1ef..1c3a986f0c3 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp
@@ -154,9 +154,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
           result = 1;
           ACE_DEBUG ((LM_ERROR, "Error: REGRESSION identified by server %u. Test Failed !!\n", last_server));
         }
-      catch (const CORBA::COMM_FAILURE& my_ex)
+      catch (const CORBA::COMM_FAILURE&)
         {
-          ACE_UNUSED_ARG (my_ex);
           // We can't use the word exception for fear of upsetting the build log parser
           ACE_DEBUG ((LM_DEBUG, "Client caught one of those things that is normally used to indicate a problem ("
                       "although it doesn't in this case) and which we cannot name because the autobuild "
diff --git a/TAO/tests/Mixed_Sync_ASync_Events/main.cpp b/TAO/tests/Mixed_Sync_ASync_Events/main.cpp
index cff4b78d7b1..c5094d29282 100644
--- a/TAO/tests/Mixed_Sync_ASync_Events/main.cpp
+++ b/TAO/tests/Mixed_Sync_ASync_Events/main.cpp
@@ -150,7 +150,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         opponent =  A::Test::_narrow (object.in ());
       } while (mode_flag == A::RM_SLAVE && CORBA::is_nil (opponent.in ()));
 
-      if (CORBA::is_nil (opponent))
+      if (CORBA::is_nil (opponent.in ()))
       {
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Cannot resolve opponent IOR: %s",
diff --git a/TAO/tests/Mixed_Sync_ASync_Events/test_i.cpp b/TAO/tests/Mixed_Sync_ASync_Events/test_i.cpp
index 5d3c356b210..1dfb79e253c 100644
--- a/TAO/tests/Mixed_Sync_ASync_Events/test_i.cpp
+++ b/TAO/tests/Mixed_Sync_ASync_Events/test_i.cpp
@@ -92,7 +92,7 @@ Test_i::report (
 void
 Test_i::shutdown (void)
 {
-  if (this->mode_ == A::RM_SLAVE && !CORBA::is_nil (this->opponent_))
+  if (this->mode_ == A::RM_SLAVE && !CORBA::is_nil (this->opponent_.in ()))
   {
     this->opponent_->shutdown ();
   }
@@ -200,7 +200,7 @@ TestHandler::handle_timeout (const ACE_Time_Value &,
   {
     if (!CORBA::is_nil (this->opponent_))
     {
-      this->opponent_->sendc_request(this->rh_, A::RQM_ASYNCH, this->counter_);
+      this->opponent_->sendc_request(this->rh_.in (), A::RQM_ASYNCH, this->counter_);
     }
   }
   return 0;
@@ -222,7 +222,7 @@ TestHandler::handle_exception (ACE_HANDLE)
   {
     if (!CORBA::is_nil (this->opponent_))
     {
-      this->opponent_->sendc_request(this->rh_, A::RQM_ASYNCH, this->counter_);
+      this->opponent_->sendc_request(this->rh_.in (), A::RQM_ASYNCH, this->counter_);
     }
   }
   return 0;