diff options
Diffstat (limited to 'TAO/tao/Object_Argument_T.cpp')
| -rw-r--r-- | TAO/tao/Object_Argument_T.cpp | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/TAO/tao/Object_Argument_T.cpp b/TAO/tao/Object_Argument_T.cpp index db3a85f5329..f3b9d225df0 100644 --- a/TAO/tao/Object_Argument_T.cpp +++ b/TAO/tao/Object_Argument_T.cpp @@ -21,8 +21,6 @@ TAO::In_Object_Argument_T<S_ptr>::marshal (TAO_OutputCDR & cdr) return cdr << this->x_; } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S_ptr> void TAO::In_Object_Argument_T<S_ptr>::interceptor_param (Dynamic::Parameter & p) @@ -31,8 +29,6 @@ TAO::In_Object_Argument_T<S_ptr>::interceptor_param (Dynamic::Parameter & p) p.mode = CORBA::PARAM_IN; } -#endif /* TAO_HAS_INTERCEPTORS */ - // =========================================================== template<typename S_ptr, typename S_traits> @@ -46,12 +42,10 @@ template<typename S_ptr, typename S_traits> CORBA::Boolean TAO::Inout_Object_Argument_T<S_ptr,S_traits>::demarshal (TAO_InputCDR & cdr) { - S_traits::release (this->x_); + S_traits::tao_release (this->x_); return cdr >> this->x_; } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S_ptr, typename S_traits> void TAO::Inout_Object_Argument_T<S_ptr,S_traits>::interceptor_param ( @@ -62,8 +56,6 @@ TAO::Inout_Object_Argument_T<S_ptr,S_traits>::interceptor_param ( p.mode = CORBA::PARAM_INOUT; } -#endif /* TAO_HAS_INTERCEPTORS */ - // ============================================================== template<typename S_ptr, typename S_out> @@ -73,8 +65,6 @@ TAO::Out_Object_Argument_T<S_ptr,S_out>::demarshal (TAO_InputCDR & cdr) return cdr >> this->x_; } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S_ptr, typename S_out> void TAO::Out_Object_Argument_T<S_ptr,S_out>::interceptor_param ( @@ -85,8 +75,6 @@ TAO::Out_Object_Argument_T<S_ptr,S_out>::interceptor_param ( p.mode = CORBA::PARAM_OUT; } -#endif /* TAO_HAS_INTERCEPTORS */ - // ============================================================ template<typename S_ptr, typename S_var> @@ -96,8 +84,6 @@ TAO::Ret_Object_Argument_T<S_ptr,S_var>::demarshal (TAO_InputCDR & cdr) return cdr >> this->x_.out (); } -#if TAO_HAS_INTERCEPTORS == 1 - template<typename S_ptr, typename S_var> void TAO::Ret_Object_Argument_T<S_ptr,S_var>::interceptor_result (CORBA::Any * any) @@ -105,6 +91,4 @@ TAO::Ret_Object_Argument_T<S_ptr,S_var>::interceptor_result (CORBA::Any * any) (*any) <<= this->x_.in (); } -#endif /* TAO_HAS_INTERCEPTORS */ - #endif /* TAO_OBJECT_ARGUMENT_T_C */ |