diff options
Diffstat (limited to 'TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp')
| -rw-r--r-- | TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp index 544e89127d3..b584831329c 100644 --- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp @@ -1,7 +1,7 @@ // $Id$ -#ifndef TAO_ANY_SPECIAL_IMPL_T_CPP -#define TAO_ANY_SPECIAL_IMPL_T_CPP +#ifndef TAO_ANY_SPECIAL_IMPL_T_C +#define TAO_ANY_SPECIAL_IMPL_T_C #include "tao/AnyTypeCode/Any_Special_Impl_T.h" #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" @@ -15,7 +15,9 @@ # include "tao/AnyTypeCode/Any_Special_Impl_T.inl" #endif /* ! __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID (tao, + Any_Special_Impl_T, + "$Id$") template<typename T, typename from_T, typename to_T> TAO::Any_Special_Impl_T<T, from_T, to_T>::Any_Special_Impl_T ( @@ -103,7 +105,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any, if (any_kind != try_kind) { - return false; + return 0; } CORBA::ULong length = @@ -112,7 +114,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any, if (length != bound) { - return false; + return 0; } TAO::Any_Impl *impl = any.impl (); @@ -127,11 +129,11 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any, if (narrow_impl == 0) { - return false; + return 0; } _tao_elem = (T *) narrow_impl->value_; - return true; + return 1; } TAO::Any_Special_Impl_T<T, from_T, to_T> *replacement = 0; @@ -140,7 +142,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any, tc, 0, bound), - false); + 0); auto_ptr<TAO::Any_Special_Impl_T<T, from_T, to_T> > replacement_safety ( replacement @@ -154,7 +156,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_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) @@ -162,7 +164,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_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. @@ -197,18 +199,10 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::_tao_decode ( ACE_ENV_ARG_DECL ) { - if (this->value_destructor_ != 0) - { - (*this->value_destructor_) (this->value_); - this->value_ = 0; - } - if (! this->demarshal_value (cdr)) { ACE_THROW (CORBA::MARSHAL ()); } } -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_ANY_T_CPP */ +#endif /* TAO_ANY_T_C */ |