diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2014-08-22 16:07:41 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2014-08-22 16:07:41 +0000 |
| commit | 6e4d0976bf7fff939be658d9f2be3bbcf96dd1b4 (patch) | |
| tree | 75f328327621fc76ec5f1453c6c448662707df56 /TAO/tao/AnyTypeCode/Any_Impl.cpp | |
| parent | 4751e25315b487a34010986ef94d9fb20aba422b (diff) | |
| download | ATCD-6e4d0976bf7fff939be658d9f2be3bbcf96dd1b4.tar.gz | |
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.
Diffstat (limited to 'TAO/tao/AnyTypeCode/Any_Impl.cpp')
| -rw-r--r-- | TAO/tao/AnyTypeCode/Any_Impl.cpp | 6 |
1 files changed, 3 insertions, 3 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; } |