Fri May 11 14:26:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

10 files changed, 42 insertions, 19 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 664cb00a611..ea2e2e85040 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,30 @@
+Fri May 11 14:26:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Naming/Naming_Server.cpp:
+          Fixed argument not used warning when messaging is disabled
+
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp:
+          Layout change
+
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp:
+          Initialise pointer with 0
+
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp:
+          bool and layout changes
+
+        * orbsvcs/tests/HTIOP/AMI/Test_Output.cpp:
+        * orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp:
+        * orbsvcs/tests/HTIOP/Hello/Test_Output.cpp:
+          Removed check for psos
+
+Fri May 11 14:16:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_typecode/enum_typecode.cpp:
+        * TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp:
+          Removed not needed includes
+
 Fri May 11 14:15:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/GIOP_Message_Generator_Parser_12.h:
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
index d787f0e0e6d..3b3a119794c 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
@@ -83,16 +83,14 @@ namespace TAO
     IOP::TaggedComponent_var tp;
     try
       {
-        tp =
-          ri->get_effective_component (IOP::TAG_FT_GROUP);
+        tp = ri->get_effective_component (IOP::TAG_FT_GROUP);
       }
     catch (const CORBA::Exception&)
       {
         return;
       }
 
-    this->group_version_context (ri,
-                                 tp);
+    this->group_version_context (ri, tp);
 
     this->request_service_context (ri);
   }
@@ -384,7 +382,7 @@ namespace TAO
           {
             ACE_DEBUG ((LM_DEBUG,
                         ACE_TEXT ("TAO_FT (%P|%t) - Using default value")
-			ACE_TEXT ("of 1.5 seconds\n")));
+                        ACE_TEXT ("of 1.5 seconds\n")));
           }
         t = 15 * 1000000;
       }
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
index 97a45fd32fb..9ea672e8414 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
@@ -64,8 +64,7 @@ TAO_LB_ClientRequestInterceptor::send_request (
   */
 
   const CORBA::Boolean replace = 0;
-  ri->add_request_service_context (service_context,
-                                   replace);
+  ri->add_request_service_context (service_context, replace);
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
index 7aa42d2bba7..f9969b33d6a 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
@@ -105,7 +105,7 @@ TAO_LB_LeastLoaded::push_loads (
     {
       ACE_GUARD (TAO_SYNCH_MUTEX, guard, *this->lock_);
 
-      TAO_LB_LoadMap::ENTRY * entry;
+      TAO_LB_LoadMap::ENTRY * entry = 0;
       if (this->load_map_->find (the_location, entry) == 0)
         {
           CosLoadBalancing::Load & previous_load = entry->int_id_;
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp
index dad51762f88..e62191f1258 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp
@@ -34,8 +34,7 @@ TAO_LB_LoadAlert_Handler::disable_alert (void)
 }
 
 void
-TAO_LB_LoadAlert_Handler::disable_alert_excep (
-    ::Messaging::ExceptionHolder *)
+TAO_LB_LoadAlert_Handler::disable_alert_excep (::Messaging::ExceptionHolder *)
 {
   if (TAO_debug_level > 0)
     ACE_ERROR ((LM_ERROR,
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
index 62ae2197a01..ae076f0acaf 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
@@ -648,6 +648,7 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
       }
 #else
   ACE_UNUSED_ARG (use_round_trip_timeout);
+  ACE_UNUSED_ARG (round_trip_timeout);
 #endif /* TAO_HAS_CORBA_MESSAGING */
     }
   catch (const CORBA::Exception& ex)
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
index f512fac54e2..ac8e8f2694a 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
@@ -86,7 +86,7 @@ TAO::SSLIOP::Current::get_peer_certificate_chain ()
 CORBA::Boolean
 TAO::SSLIOP::Current::no_context (void)
 {
-  return (this->implementation () == 0 ? 1 : 0);
+  return (this->implementation () == 0 ? true : false);
 }
 
 void
@@ -117,8 +117,7 @@ TAO::SSLIOP::Current::teardown (TAO::SSLIOP::Current_Impl *prev_impl,
 }
 
 TAO::SSLIOP::Current_ptr
-TAO::SSLIOP::Current::_narrow (
-  CORBA::Object_ptr obj)
+TAO::SSLIOP::Current::_narrow (CORBA::Object_ptr obj)
 {
   return  TAO::SSLIOP::Current::_duplicate (
               dynamic_cast<TAO::SSLIOP::Current *> (obj));
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp
index 8ab1d029463..f39c993825e 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp
@@ -47,9 +47,9 @@ ACE_Test_Output::ACE_Test_Output (void)
 
 ACE_Test_Output::~ACE_Test_Output (void)
 {
-#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) && !defined (ACE_PSOS)
+#if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
   ACE_LOG_MSG->msg_ostream (&cerr);
-#endif /* ! ACE_LACKS_IOSTREAM_TOTALLY && ! ACE_PSOS */
+#endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */
 
   ACE_LOG_MSG->clr_flags (ACE_Log_Msg::OSTREAM);
   ACE_LOG_MSG->set_flags (ACE_Log_Msg::STDERR);
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp
index 8ab1d029463..f39c993825e 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp
@@ -47,9 +47,9 @@ ACE_Test_Output::ACE_Test_Output (void)
 
 ACE_Test_Output::~ACE_Test_Output (void)
 {
-#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) && !defined (ACE_PSOS)
+#if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
   ACE_LOG_MSG->msg_ostream (&cerr);
-#endif /* ! ACE_LACKS_IOSTREAM_TOTALLY && ! ACE_PSOS */
+#endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */
 
   ACE_LOG_MSG->clr_flags (ACE_Log_Msg::OSTREAM);
   ACE_LOG_MSG->set_flags (ACE_Log_Msg::STDERR);
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp
index 8ab1d029463..f39c993825e 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp
@@ -47,9 +47,9 @@ ACE_Test_Output::ACE_Test_Output (void)
 
 ACE_Test_Output::~ACE_Test_Output (void)
 {
-#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) && !defined (ACE_PSOS)
+#if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
   ACE_LOG_MSG->msg_ostream (&cerr);
-#endif /* ! ACE_LACKS_IOSTREAM_TOTALLY && ! ACE_PSOS */
+#endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */
 
   ACE_LOG_MSG->clr_flags (ACE_Log_Msg::OSTREAM);
   ACE_LOG_MSG->set_flags (ACE_Log_Msg::STDERR);