diff options
Diffstat (limited to 'TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp')
| -rw-r--r-- | TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp index ad9c1a3470e..258c469dd0e 100644 --- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp @@ -1,7 +1,7 @@ // $Id$ -#ifndef TAO_ANY_ARRAY_IMPL_T_CPP -#define TAO_ANY_ARRAY_IMPL_T_CPP +#ifndef TAO_ANY_ARRAY_IMPL_T_C +#define TAO_ANY_ARRAY_IMPL_T_C #include "tao/AnyTypeCode/Any_Array_Impl_T.h" #include "tao/AnyTypeCode/Any.h" @@ -18,7 +18,9 @@ # include "tao/AnyTypeCode/Any_Array_Impl_T.inl" #endif /* ! __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID (tao, + Any_Array_Impl_T, + "$Id$") template<typename T_slice, typename T_forany> TAO::Any_Array_Impl_T<T_slice, T_forany>::Any_Array_Impl_T ( @@ -65,14 +67,14 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any, ACE_TRY_NEW_ENV { CORBA::TypeCode_ptr any_tc = any._tao_get_typecode (); - CORBA::Boolean const _tao_equiv = + const 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 (); @@ -84,11 +86,11 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any, if (narrow_impl == 0) { - return false; + return 0; } _tao_elem = reinterpret_cast <T_slice*> (narrow_impl->value_); - return true; + return 1; } TAO::Any_Array_Impl_T<T_slice, T_forany> *replacement = 0; @@ -97,7 +99,7 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any, ARRAY_ANY_IMPL (destructor, any_tc, T_forany::tao_alloc ()), - false); + 0); auto_ptr<TAO::Any_Array_Impl_T<T_slice, T_forany> > replacement_safety ( replacement @@ -111,7 +113,7 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::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) @@ -119,7 +121,7 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any, _tao_elem = reinterpret_cast <T_slice*> (replacement->value_); const_cast<CORBA::Any &> (any).replace (replacement); replacement_safety.release (); - return true; + return 1; } // Duplicated by Any_Impl base class constructor. @@ -158,6 +160,4 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::_tao_decode (TAO_InputCDR &cdr } } -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_ANY_ARRAY_IMPL_T_CPP */ +#endif /* TAO_ANY_ARRAY_IMPL_T_C */ |