Fri Aug 22 15:57:21 UTC 2014 Phil Mesnier <mesnier_p@ociweb.com>

        * examples/AMH/Sink_Server/MT_AMH_Server.h:
        * examples/Event_Comm/Consumer_Input_Handler.h:
        * orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.h:
        * tests/MT_BiDir/Client_Task.h:
        * tests/Stack_Recursion/Server_Task.h:
        * tests/Two_Objects/Second_i.h:
          Correct the include guard macro.

        * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp:
        * orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp:
        * tao/AnyTypeCode/Any_Impl.cpp:
        * tao/Strategies/DIOP_Profile.cpp:
        * tao/Strategies/SHMIOP_Profile.cpp:
        * tao/Strategies/UIOP_Profile.cpp:
          Make order of evaluation explicit.

        * tao/LF_Multi_Event.cpp:
          Fix logic error in final state detection. This code may be unused
          as a clear error has never resulted in a runtime issue.

5 files changed, 7 insertions, 10 deletions

diff --git a/TAO/tao/AnyTypeCode/Any_Impl.cpp b/TAO/tao/AnyTypeCode/Any_Impl.cpp
index 1caab33a6e2..b65943a7333 100644
--- a/TAO/tao/AnyTypeCode/Any_Impl.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Impl.cpp
@@ -39,9 +39,9 @@ TAO::Any_Impl::marshal (TAO_OutputCDR &cdr)
       // the type we are marshaling NOT the
       // typecode of the base pointer that may
       // have been inserted into the any.
-      if (cdr << TAO_ORB_Core_instance ()
-                 ->valuetype_adapter()
-                 ->derived_type (vb) == 0)
+      if ((cdr << TAO_ORB_Core_instance ()
+                  ->valuetype_adapter()
+                  ->derived_type (vb)) == 0)
         {
           return false;
         }
diff --git a/TAO/tao/LF_Multi_Event.cpp b/TAO/tao/LF_Multi_Event.cpp
index 2e48265f82a..0e4d6870ee3 100644
--- a/TAO/tao/LF_Multi_Event.cpp
+++ b/TAO/tao/LF_Multi_Event.cpp
@@ -113,7 +113,7 @@ TAO_LF_Multi_Event::is_state_final (void)
 {
   int result = 1;
   for (Event_Node *n = this->events_; n != 0; n = n->next_)
-    if (!n->ptr_->is_state_final () == 0)
+    if (n->ptr_->is_state_final () == 0)
       result = 0;
   return result;
 }
diff --git a/TAO/tao/Strategies/DIOP_Profile.cpp b/TAO/tao/Strategies/DIOP_Profile.cpp
index 138be0fe703..97b21207238 100644
--- a/TAO/tao/Strategies/DIOP_Profile.cpp
+++ b/TAO/tao/Strategies/DIOP_Profile.cpp
@@ -543,8 +543,7 @@ TAO_DIOP_Profile::encode_endpoints (void)
 
   // Encode the data structure.
   TAO_OutputCDR out_cdr;
-  if ((out_cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)
-       == 0)
+  if ((out_cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)) == 0
       || (out_cdr << endpoints) == 0)
     return -1;
 
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.cpp b/TAO/tao/Strategies/SHMIOP_Profile.cpp
index 77a8fd74df5..773bac88a1d 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Profile.cpp
@@ -423,8 +423,7 @@ TAO_SHMIOP_Profile::encode_endpoints (void)
 
   // Encode the data structure.
   TAO_OutputCDR out_cdr;
-  if ((out_cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)
-       == 0)
+  if ((out_cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)) == 0
       || (out_cdr << endpoints) == 0)
     return -1;
   size_t length = out_cdr.total_length ();
diff --git a/TAO/tao/Strategies/UIOP_Profile.cpp b/TAO/tao/Strategies/UIOP_Profile.cpp
index e3646f463ea..ce1d6c6bbb6 100644
--- a/TAO/tao/Strategies/UIOP_Profile.cpp
+++ b/TAO/tao/Strategies/UIOP_Profile.cpp
@@ -365,8 +365,7 @@ TAO_UIOP_Profile::encode_endpoints (void)
 
   // Encode the data structure.
   TAO_OutputCDR out_cdr;
-  if ((out_cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)
-       == 0)
+  if ((out_cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)) == 0
       || (out_cdr << endpoints) == 0)
     return -1;