diff options
Diffstat (limited to 'TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp')
-rw-r--r-- | TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp index d2871693f43..d5fc92f2467 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp @@ -1,7 +1,7 @@ // $Id$ -#ifndef TAO_ANY_BASIC_IMPL_T_CPP -#define TAO_ANY_BASIC_IMPL_T_CPP +#ifndef TAO_ANY_BASIC_IMPL_T_C +#define TAO_ANY_BASIC_IMPL_T_C #include "tao/AnyTypeCode/Any_Basic_Impl_T.h" #include "tao/AnyTypeCode/Any.h" @@ -18,7 +18,10 @@ # include "tao/AnyTypeCode/Any_Basic_Impl_T.inl" #endif /* ! __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID (tao, + Any_Basic_Impl_T, + "$Id$") + template<typename T> TAO::Any_Basic_Impl_T<T>::Any_Basic_Impl_T (CORBA::TypeCode_ptr tc, @@ -56,13 +59,13 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any, ACE_TRY_NEW_ENV { CORBA::TypeCode_ptr any_tc = any._tao_get_typecode (); - CORBA::Boolean const _tao_equiv = any_tc->equivalent (tc - ACE_ENV_ARG_PARAMETER); + CORBA::Boolean _tao_equiv = any_tc->equivalent (tc + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (_tao_equiv == false) + if (_tao_equiv == 0) { - return false; + return 0; } TAO::Any_Impl *impl = any.impl (); @@ -74,11 +77,11 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any, if (narrow_impl == 0) { - return false; + return 0; } _tao_elem = narrow_impl->value_; - return true; + return 1; } TAO::Any_Basic_Impl_T<T> *replacement = @@ -94,7 +97,7 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any, // shared by another Any. This copies the state, not the buffer. TAO_InputCDR for_reading (unk->_tao_get_cdr ()); - CORBA::Boolean const good_decode = + CORBA::Boolean good_decode = replacement->demarshal_value (for_reading); if (good_decode) @@ -102,7 +105,7 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any, _tao_elem = replacement->value_; const_cast<CORBA::Any &> (any).replace (replacement); replacement_safety.release (); - return true; + return 1; } // Duplicated by Any_Impl base class constructor. @@ -113,7 +116,7 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any, } ACE_ENDTRY; - return false; + return 0; } template<typename T> @@ -139,6 +142,4 @@ TAO::Any_Basic_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr } } -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_ANY_BASIC_IMPL_T_CPP */ +#endif /* TAO_ANY_BASIC_IMPL_T_C */ |