diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-08-06 18:27:58 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-08-06 18:27:58 +0000 |
| commit | a7031226249350bf5647580e01012bd94be2ad7f (patch) | |
| tree | 043f9113acd1ebf8f6d80ff63af754e0da420cb7 /TAO | |
| parent | 1fcdb62ee9b4cd0b59bf96d9d318e9e9997b19de (diff) | |
| download | ATCD-a7031226249350bf5647580e01012bd94be2ad7f.tar.gz | |
ChangeLogTag: Fri Aug 6 12:51:33 2004 Jeff Parsons <j.parsons@vanderbilt.edu>
Diffstat (limited to 'TAO')
43 files changed, 507 insertions, 151 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 03262d1cb30..c02b9f5c0ce 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,54 @@ +Fri Aug 6 12:51:33 2004 Jeff Parsons <j.parsons@vanderbilt.edu> + + * tao/Argument.cpp: + * tao/Argument.h: + * tao/BD_String_Argument_T.cpp: + * tao/BD_String_Argument_T.h: + * tao/BD_String_SArgument_T.cpp: + * tao/BD_String_SArgument_T.h: + * tao/Basic_Argument_T.cpp: + * tao/Basic_Argument_T.h: + * tao/Basic_SArgument_T.cpp: + * tao/Basic_SArgument_T.h: + * tao/DomainC.cpp: + * tao/Fixed_Array_Argument_T.cpp: + * tao/Fixed_Array_Argument_T.h: + * tao/Fixed_Array_SArgument_T.cpp: + * tao/Fixed_Array_SArgument_T.h: + * tao/Fixed_Size_Argument_T.cpp: + * tao/Fixed_Size_Argument_T.h: + * tao/Fixed_Size_SArgument_T.cpp: + * tao/Fixed_Size_SArgument_T.h: + * tao/Object_Argument_T.cpp: + * tao/Object_Argument_T.h: + * tao/Object_SArgument_T.cpp: + * tao/Object_SArgument_T.h: + * tao/Special_Basic_Argument_T.cpp: + * tao/Special_Basic_Argument_T.h: + * tao/Special_Basic_SArgument_T.cpp: + * tao/Special_Basic_SArgument_T.h: + * tao/UB_String_Argument_T.cpp: + * tao/UB_String_Argument_T.h: + * tao/UB_String_SArgument_T.cpp: + * tao/UB_String_SArgument_T.h: + * tao/Var_Array_Argument_T.cpp: + * tao/Var_Array_Argument_T.h: + * tao/Var_Array_SArgument_T.cpp: + * tao/Var_Array_SArgument_T.h: + * tao/Var_Size_Argument_T.cpp: + * tao/Var_Size_Argument_T.h: + * tao/Var_Size_SArgument_T.cpp: + * tao/Var_Size_SArgument_T.h: + * tao/operation_details.cpp: + * tao/operation_details.h: + * tao/DynamicInterface/DII_Invocation.cpp: + + Added TAO_HAS_INTERCEPTORS == 1 guards to all interceptor-related + operations, so code generated from IDL operations will compile + if Any operators (used by interceptors) are suppressed in code + generation. Thanks to Nicolas HUYNH <HUYNH_Nicolas at cena dot fr> + for reporting the problem. + Fri Aug 6 15:45:00 UTC 2004 Simon Massey <simon.massey@prismtechnologies.com> * TAO/utils/catior/catior.cpp diff --git a/TAO/tao/Argument.cpp b/TAO/tao/Argument.cpp index 51327b316a5..e038eeec2d7 100644 --- a/TAO/tao/Argument.cpp +++ b/TAO/tao/Argument.cpp @@ -19,6 +19,8 @@ TAO::Argument::demarshal (TAO_InputCDR &) return 1; } +#if TAO_HAS_INTERCEPTORS == 1 + void TAO::Argument::interceptor_param (Dynamic::Parameter &) { @@ -29,3 +31,5 @@ TAO::Argument::interceptor_result (CORBA::Any *) { } +#endif /* TAO_HAS_INTERCEPTORS */ + diff --git a/TAO/tao/Argument.h b/TAO/tao/Argument.h index 28b6db65ed2..647b26a1685 100644 --- a/TAO/tao/Argument.h +++ b/TAO/tao/Argument.h @@ -21,6 +21,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/orbconf.h" #include "tao/TAO_Export.h" namespace Dynamic @@ -50,8 +51,10 @@ namespace TAO virtual ~Argument (void); virtual CORBA::Boolean marshal (TAO_OutputCDR &); virtual CORBA::Boolean demarshal (TAO_InputCDR &); +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); virtual void interceptor_result (CORBA::Any *); +#endif /* TAO_HAS_INTERCEPTORS == 1 */ }; } diff --git a/TAO/tao/BD_String_Argument_T.cpp b/TAO/tao/BD_String_Argument_T.cpp index 0c5adc5590e..22e301d9d4f 100644 --- a/TAO/tao/BD_String_Argument_T.cpp +++ b/TAO/tao/BD_String_Argument_T.cpp @@ -23,6 +23,8 @@ TAO::In_BD_String_Argument_T<S,to_S,from_S,BOUND>::marshal ( return cdr << from_S (this->x_, BOUND); } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S, typename to_S, typename from_S, size_t BOUND> void TAO::In_BD_String_Argument_T<S,to_S,from_S,BOUND>::interceptor_param ( @@ -33,6 +35,8 @@ TAO::In_BD_String_Argument_T<S,to_S,from_S,BOUND>::interceptor_param ( p.mode = CORBA::PARAM_IN; } +#endif /* TAO_HAS_INTERCEPTORS */ + // =========================================================== template<typename S, typename to_S, typename from_S, size_t BOUND> @@ -54,6 +58,8 @@ TAO::Inout_BD_String_Argument_T<S,to_S,from_S,BOUND>::demarshal ( return cdr >> to_S (this->x_, BOUND); } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S, typename to_S, typename from_S, size_t BOUND> void TAO::Inout_BD_String_Argument_T<S,to_S,from_S,BOUND>::interceptor_param ( @@ -64,6 +70,8 @@ TAO::Inout_BD_String_Argument_T<S,to_S,from_S,BOUND>::interceptor_param ( p.mode = CORBA::PARAM_INOUT; } +#endif /* TAO_HAS_INTERCEPTORS */ + // ============================================================== template<typename S, @@ -84,6 +92,8 @@ template<typename S, typename to_S, typename from_S, size_t BOUND> +#if TAO_HAS_INTERCEPTORS == 1 + void TAO::Out_BD_String_Argument_T<S,S_out,to_S,from_S,BOUND>::interceptor_param ( Dynamic::Parameter & p @@ -93,6 +103,8 @@ TAO::Out_BD_String_Argument_T<S,S_out,to_S,from_S,BOUND>::interceptor_param ( p.mode = CORBA::PARAM_OUT; } +#endif /* TAO_HAS_INTERCEPTORS */ + // ============================================================ template<typename S, @@ -108,6 +120,8 @@ TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND>::demarshal ( return cdr >> to_S (this->x_.out (), BOUND); } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S, typename S_var, typename to_S, @@ -121,4 +135,6 @@ TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND>::interceptor_result ( (*any) <<= from_S (this->x_.in (), BOUND); } +#endif /* TAO_HAS_INTERCEPTORS */ + #endif /* TAO_BD_STRING_ARGUMENT_T_C */ diff --git a/TAO/tao/BD_String_Argument_T.h b/TAO/tao/BD_String_Argument_T.h index 0d6c0b390a7..43502f0b869 100644 --- a/TAO/tao/BD_String_Argument_T.h +++ b/TAO/tao/BD_String_Argument_T.h @@ -38,9 +38,9 @@ namespace TAO In_BD_String_Argument_T (const S * x); virtual CORBA::Boolean marshal (TAO_OutputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ const S * arg (void) const; private: @@ -61,9 +61,9 @@ namespace TAO virtual CORBA::Boolean marshal (TAO_OutputCDR &); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S *& arg (void); private: @@ -87,9 +87,9 @@ namespace TAO Out_BD_String_Argument_T (S_out x); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S *& arg (void); private: @@ -113,9 +113,9 @@ namespace TAO Ret_BD_String_Argument_T (void); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_result (CORBA::Any *); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S *& arg (void); S * excp (void); diff --git a/TAO/tao/BD_String_SArgument_T.cpp b/TAO/tao/BD_String_SArgument_T.cpp index cdc0eabb792..d428442272a 100644 --- a/TAO/tao/BD_String_SArgument_T.cpp +++ b/TAO/tao/BD_String_SArgument_T.cpp @@ -27,6 +27,8 @@ TAO::In_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::demarshal ( return cdr >> to_S (this->x_.out (), BOUND); } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S, typename S_var, typename to_S, @@ -41,6 +43,8 @@ TAO::In_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::interceptor_param ( p.mode = CORBA::PARAM_IN; } +#endif /* TAO_HAS_INTERCEPTORS */ + // =========================================================== template<typename S, @@ -69,6 +73,8 @@ TAO::Inout_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::demarshal ( return cdr >> to_S (this->x_.out (), BOUND); } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S, typename S_var, typename to_S, @@ -82,6 +88,8 @@ interceptor_param (Dynamic::Parameter & p) p.mode = CORBA::PARAM_INOUT; } +#endif /* TAO_HAS_INTERCEPTORS */ + // ============================================================== template<typename S, @@ -98,6 +106,8 @@ TAO::Out_BD_String_SArgument_T<S,S_var,S_out,to_S,from_S,BOUND>::marshal ( return cdr << from_S (this->x_.in (), BOUND); } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S, typename S_var, typename S_out, @@ -112,6 +122,8 @@ interceptor_param (Dynamic::Parameter & p) p.mode = CORBA::PARAM_OUT; } +#endif /* TAO_HAS_INTERCEPTORS */ + // ============================================================ template<typename S, @@ -127,6 +139,8 @@ TAO::Ret_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::marshal ( return cdr << from_S (this->x_.in (), BOUND); } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S, typename S_var, typename to_S, @@ -139,4 +153,6 @@ interceptor_result (CORBA::Any * any) (*any) <<= from_S (this->x_.in (), BOUND); } +#endif /* TAO_HAS_INTERCEPTORS */ + #endif /* TAO_BD_STRING_SARGUMENT_T_C */ diff --git a/TAO/tao/BD_String_SArgument_T.h b/TAO/tao/BD_String_SArgument_T.h index ff37eb463d6..829fd3dc548 100644 --- a/TAO/tao/BD_String_SArgument_T.h +++ b/TAO/tao/BD_String_SArgument_T.h @@ -42,9 +42,9 @@ namespace TAO In_BD_String_SArgument_T (void); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ const S * arg (void) const; private: @@ -69,9 +69,9 @@ namespace TAO virtual CORBA::Boolean marshal (TAO_OutputCDR &); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S *& arg (void); private: @@ -96,9 +96,9 @@ namespace TAO Out_BD_String_SArgument_T (void); virtual CORBA::Boolean marshal (TAO_OutputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S *& arg (void); private: @@ -122,9 +122,9 @@ namespace TAO Ret_BD_String_SArgument_T (void); virtual CORBA::Boolean marshal (TAO_OutputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_result (CORBA::Any *); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S *& arg (void); private: diff --git a/TAO/tao/Basic_Argument_T.cpp b/TAO/tao/Basic_Argument_T.cpp index 5bade0f3c2d..353d125e7a8 100644 --- a/TAO/tao/Basic_Argument_T.cpp +++ b/TAO/tao/Basic_Argument_T.cpp @@ -21,6 +21,8 @@ TAO::In_Basic_Argument_T<S>::marshal (TAO_OutputCDR & cdr) return cdr << this->x_; } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S> void TAO::In_Basic_Argument_T<S>::interceptor_param (Dynamic::Parameter & p) @@ -29,6 +31,8 @@ TAO::In_Basic_Argument_T<S>::interceptor_param (Dynamic::Parameter & p) p.mode = CORBA::PARAM_IN; } +#endif /* TAO_HAS_INTERCEPTORS */ + // =========================================================== template<typename S> @@ -45,6 +49,8 @@ TAO::Inout_Basic_Argument_T<S>::demarshal (TAO_InputCDR & cdr) return cdr >> this->x_; } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S> void TAO::Inout_Basic_Argument_T<S>::interceptor_param (Dynamic::Parameter & p) @@ -53,6 +59,8 @@ TAO::Inout_Basic_Argument_T<S>::interceptor_param (Dynamic::Parameter & p) p.mode = CORBA::PARAM_INOUT; } +#endif /* TAO_HAS_INTERCEPTORS */ + // ============================================================== template<typename S> @@ -62,6 +70,8 @@ TAO::Out_Basic_Argument_T<S>::demarshal (TAO_InputCDR & cdr) return cdr >> this->x_; } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S> void TAO::Out_Basic_Argument_T<S>::interceptor_param (Dynamic::Parameter & p) @@ -70,6 +80,8 @@ TAO::Out_Basic_Argument_T<S>::interceptor_param (Dynamic::Parameter & p) p.mode = CORBA::PARAM_OUT; } +#endif /* TAO_HAS_INTERCEPTORS */ + // ============================================================ template<typename S> @@ -79,6 +91,8 @@ TAO::Ret_Basic_Argument_T<S>::demarshal (TAO_InputCDR & cdr) return cdr >> this->x_; } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S> void TAO::Ret_Basic_Argument_T<S>::interceptor_result (CORBA::Any * any) @@ -86,4 +100,6 @@ TAO::Ret_Basic_Argument_T<S>::interceptor_result (CORBA::Any * any) (*any) <<= this->x_; } +#endif /* TAO_HAS_INTERCEPTORS */ + #endif /* TAO_BASIC_ARGUMENT_T_C */ diff --git a/TAO/tao/Basic_Argument_T.h b/TAO/tao/Basic_Argument_T.h index 61a7cbbf946..101aa3d94c5 100644 --- a/TAO/tao/Basic_Argument_T.h +++ b/TAO/tao/Basic_Argument_T.h @@ -37,9 +37,9 @@ namespace TAO In_Basic_Argument_T (S const & x); virtual CORBA::Boolean marshal (TAO_OutputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S arg (void) const; private: @@ -60,9 +60,9 @@ namespace TAO virtual CORBA::Boolean marshal (TAO_OutputCDR &); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S & arg (void); private: @@ -82,9 +82,9 @@ namespace TAO Out_Basic_Argument_T (S & x); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S & arg (void); private: @@ -104,9 +104,9 @@ namespace TAO Ret_Basic_Argument_T (void); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_result (CORBA::Any *); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S & arg (void); S excp (void); diff --git a/TAO/tao/Basic_SArgument_T.cpp b/TAO/tao/Basic_SArgument_T.cpp index afa1323b7df..2bfd618f9a6 100644 --- a/TAO/tao/Basic_SArgument_T.cpp +++ b/TAO/tao/Basic_SArgument_T.cpp @@ -21,6 +21,8 @@ TAO::In_Basic_SArgument_T<S>::demarshal (TAO_InputCDR &cdr) return cdr >> this->x_; } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S> void TAO::In_Basic_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p) @@ -29,6 +31,8 @@ TAO::In_Basic_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p) p.mode = CORBA::PARAM_IN; } +#endif /* TAO_HAS_INTERCEPTORS */ + // =========================================================== template<typename S> @@ -45,6 +49,8 @@ TAO::Inout_Basic_SArgument_T<S>::demarshal (TAO_InputCDR & cdr) return cdr >> this->x_; } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S> void TAO::Inout_Basic_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p) @@ -53,6 +59,8 @@ TAO::Inout_Basic_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p) p.mode = CORBA::PARAM_INOUT; } +#endif /* TAO_HAS_INTERCEPTORS */ + // ============================================================== template<typename S> @@ -62,6 +70,8 @@ TAO::Out_Basic_SArgument_T<S>::marshal (TAO_OutputCDR &cdr) return cdr << this->x_; } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S> void TAO::Out_Basic_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p) @@ -70,6 +80,8 @@ TAO::Out_Basic_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p) p.mode = CORBA::PARAM_OUT; } +#endif /* TAO_HAS_INTERCEPTORS */ + // ============================================================ template<typename S> @@ -79,6 +91,8 @@ TAO::Ret_Basic_SArgument_T<S>::marshal (TAO_OutputCDR & cdr) return cdr << this->x_; } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S> void TAO::Ret_Basic_SArgument_T<S>::interceptor_result (CORBA::Any * any) @@ -86,4 +100,6 @@ TAO::Ret_Basic_SArgument_T<S>::interceptor_result (CORBA::Any * any) (*any) <<= this->x_; } +#endif /* TAO_HAS_INTERCEPTORS */ + #endif /* TAO_BASIC_SARGUMENT_T_C */ diff --git a/TAO/tao/Basic_SArgument_T.h b/TAO/tao/Basic_SArgument_T.h index 28db20c6f25..f4eaf282bf0 100644 --- a/TAO/tao/Basic_SArgument_T.h +++ b/TAO/tao/Basic_SArgument_T.h @@ -37,9 +37,9 @@ namespace TAO In_Basic_SArgument_T (void); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S arg (void) const; private: @@ -60,9 +60,9 @@ namespace TAO virtual CORBA::Boolean marshal (TAO_OutputCDR &); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S & arg (void); private: @@ -82,9 +82,9 @@ namespace TAO Out_Basic_SArgument_T (void); virtual CORBA::Boolean marshal (TAO_OutputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S & arg (void); private: @@ -104,9 +104,9 @@ namespace TAO Ret_Basic_SArgument_T (void); virtual CORBA::Boolean marshal (TAO_OutputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_result (CORBA::Any *); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S & arg (void); private: diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp index 5d57ebb49c7..f41b34fa77d 100644 --- a/TAO/tao/DomainC.cpp +++ b/TAO/tao/DomainC.cpp @@ -65,6 +65,8 @@ namespace CORBA typedef TAO_Objref_Out_T<InterfaceDef> InterfaceDef_out; } +#if TAO_HAS_INTERCEPTORS == 1 + ACE_TEMPLATE_SPECIALIZATION void TAO::In_Object_Argument_T<CORBA::InterfaceDef_ptr>::interceptor_param (Dynamic::Parameter & p) @@ -78,6 +80,8 @@ TAO::In_Object_Argument_T<CORBA::InterfaceDef_ptr>::interceptor_param (Dynamic:: p.mode = CORBA::PARAM_IN; } +#endif /* TAO_HAS_INTERCEPTORS */ + ACE_TEMPLATE_SPECIALIZATION CORBA::Boolean TAO::In_Object_Argument_T<CORBA::InterfaceDef_ptr>::marshal (TAO_OutputCDR & cdr) diff --git a/TAO/tao/DynamicInterface/DII_Invocation.cpp b/TAO/tao/DynamicInterface/DII_Invocation.cpp index 11d43e96011..4e96ad4bff2 100644 --- a/TAO/tao/DynamicInterface/DII_Invocation.cpp +++ b/TAO/tao/DynamicInterface/DII_Invocation.cpp @@ -71,7 +71,7 @@ namespace TAO return safe_parameter_list._retn (); } -#endif /*TAO_HAS_INTERCEPTORS*/ +#endif /* TAO_HAS_INTERCEPTORS == 1 */ Invocation_Status DII_Invocation::remote_invocation (ACE_Time_Value *max_wait_time @@ -218,7 +218,7 @@ namespace TAO return safe_parameter_list._retn (); } -#endif /*TAO_HAS_INTERCEPTORS*/ +#endif /* TAO_HAS_INTERCEPTORS == 1*/ Invocation_Status DII_Deferred_Invocation::remote_invocation ( diff --git a/TAO/tao/Fixed_Array_Argument_T.cpp b/TAO/tao/Fixed_Array_Argument_T.cpp index 64cb1090356..9f5940e3a06 100644 --- a/TAO/tao/Fixed_Array_Argument_T.cpp +++ b/TAO/tao/Fixed_Array_Argument_T.cpp @@ -23,6 +23,8 @@ TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany>::marshal ( return cdr << this->x_; } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S, typename S_slice, typename S_forany> void TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany>::interceptor_param ( @@ -33,6 +35,8 @@ TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany>::interceptor_param ( p.mode = CORBA::PARAM_IN; } +#endif /* TAO_HAS_INTERCEPTORS */ + // =========================================================== template<typename S, typename S_slice, typename S_forany> @@ -53,6 +57,8 @@ TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany>::demarshal ( return cdr >> this->x_; } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S, typename S_slice, typename S_forany> void TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany>::interceptor_param ( @@ -63,6 +69,8 @@ TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany>::interceptor_param ( p.mode = CORBA::PARAM_INOUT; } +#endif /* TAO_HAS_INTERCEPTORS */ + // ============================================================== template<typename S, typename S_slice, typename S_forany> @@ -74,6 +82,8 @@ TAO::Out_Fixed_Array_Argument_T<S,S_slice,S_forany>::demarshal ( return cdr >> this->x_; } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S, typename S_slice, typename S_forany> void TAO::Out_Fixed_Array_Argument_T<S,S_slice,S_forany>::interceptor_param ( @@ -84,6 +94,8 @@ TAO::Out_Fixed_Array_Argument_T<S,S_slice,S_forany>::interceptor_param ( p.mode = CORBA::PARAM_OUT; } +#endif /* TAO_HAS_INTERCEPTORS */ + // ============================================================ template<typename S, @@ -106,6 +118,8 @@ TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::demarshal ( return cdr >> tmp; } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S, typename S_slice, typename S_var, @@ -118,4 +132,6 @@ interceptor_result (CORBA::Any * any) (*any) <<= S_forany (this->x_.ptr ()); } +#endif /* TAO_HAS_INTERCEPTORS */ + #endif /* TAO_FIXED_ARRAY_ARGUMENT_T_C */ diff --git a/TAO/tao/Fixed_Array_Argument_T.h b/TAO/tao/Fixed_Array_Argument_T.h index e6afe22871e..e4506ec5d8c 100644 --- a/TAO/tao/Fixed_Array_Argument_T.h +++ b/TAO/tao/Fixed_Array_Argument_T.h @@ -36,9 +36,9 @@ namespace TAO In_Fixed_Array_Argument_T (const S_slice * x); virtual CORBA::Boolean marshal (TAO_OutputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ const S_slice * arg (void) const; private: @@ -59,9 +59,9 @@ namespace TAO virtual CORBA::Boolean marshal (TAO_OutputCDR &); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S_slice * arg (void); private: @@ -81,9 +81,9 @@ namespace TAO Out_Fixed_Array_Argument_T (S_slice *& x); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S_slice *& arg (void); private: @@ -107,9 +107,9 @@ namespace TAO Ret_Fixed_Array_Argument_T (void); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_result (CORBA::Any *); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S_slice *& arg (void); S_slice * excp (void); diff --git a/TAO/tao/Fixed_Array_SArgument_T.cpp b/TAO/tao/Fixed_Array_SArgument_T.cpp index cd59b4db789..48c9cda74c8 100644 --- a/TAO/tao/Fixed_Array_SArgument_T.cpp +++ b/TAO/tao/Fixed_Array_SArgument_T.cpp @@ -22,6 +22,8 @@ TAO::In_Fixed_Array_SArgument_T<S,S_forany>::demarshal (TAO_InputCDR &cdr) return cdr >> tmp; } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S, typename S_forany> void TAO::In_Fixed_Array_SArgument_T<S,S_forany>::interceptor_param ( @@ -32,6 +34,8 @@ TAO::In_Fixed_Array_SArgument_T<S,S_forany>::interceptor_param ( p.mode = CORBA::PARAM_IN; } +#endif /* TAO_HAS_INTERCEPTORS */ + // =========================================================== template<typename S, typename S_forany> @@ -49,6 +53,8 @@ TAO::Inout_Fixed_Array_SArgument_T<S,S_forany>::demarshal (TAO_InputCDR & cdr) return cdr >> tmp; } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S, typename S_forany> void TAO::Inout_Fixed_Array_SArgument_T<S,S_forany>::interceptor_param ( @@ -59,6 +65,8 @@ TAO::Inout_Fixed_Array_SArgument_T<S,S_forany>::interceptor_param ( p.mode = CORBA::PARAM_INOUT; } +#endif /* TAO_HAS_INTERCEPTORS */ + // ============================================================== template<typename S, typename S_forany> @@ -68,6 +76,8 @@ TAO::Out_Fixed_Array_SArgument_T<S,S_forany>::marshal (TAO_OutputCDR &cdr) return cdr << S_forany (this->x_); } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S, typename S_forany> void TAO::Out_Fixed_Array_SArgument_T<S,S_forany>::interceptor_param ( @@ -78,6 +88,8 @@ TAO::Out_Fixed_Array_SArgument_T<S,S_forany>::interceptor_param ( p.mode = CORBA::PARAM_OUT; } +#endif /* TAO_HAS_INTERCEPTORS */ + // ============================================================ template<typename S_slice, typename S_var, typename S_forany> @@ -89,6 +101,8 @@ TAO::Ret_Fixed_Array_SArgument_T<S_slice,S_var,S_forany>::marshal ( return cdr << S_forany (this->x_.inout ()); } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S_slice, typename S_var, typename S_forany> void TAO::Ret_Fixed_Array_SArgument_T<S_slice,S_var,S_forany>::interceptor_result ( @@ -98,4 +112,6 @@ TAO::Ret_Fixed_Array_SArgument_T<S_slice,S_var,S_forany>::interceptor_result ( (*any) <<= S_forany (this->x_.ptr ()); } +#endif /* TAO_HAS_INTERCEPTORS */ + #endif /* TAO_FIXED_ARRAY_SARGUMENT_T_C */ diff --git a/TAO/tao/Fixed_Array_SArgument_T.h b/TAO/tao/Fixed_Array_SArgument_T.h index beef979efcb..6e6fb9a52f7 100644 --- a/TAO/tao/Fixed_Array_SArgument_T.h +++ b/TAO/tao/Fixed_Array_SArgument_T.h @@ -36,9 +36,9 @@ namespace TAO In_Fixed_Array_SArgument_T (void); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ const S & arg (void) const; private: @@ -59,9 +59,9 @@ namespace TAO virtual CORBA::Boolean marshal (TAO_OutputCDR &); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S & arg (void); private: @@ -81,9 +81,9 @@ namespace TAO Out_Fixed_Array_SArgument_T (void); virtual CORBA::Boolean marshal (TAO_OutputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S & arg (void); private: @@ -103,9 +103,9 @@ namespace TAO Ret_Fixed_Array_SArgument_T (void); virtual CORBA::Boolean marshal (TAO_OutputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_result (CORBA::Any *); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S_slice *& arg (void); private: diff --git a/TAO/tao/Fixed_Size_Argument_T.cpp b/TAO/tao/Fixed_Size_Argument_T.cpp index 8d13d7f0fe2..0819eabf688 100644 --- a/TAO/tao/Fixed_Size_Argument_T.cpp +++ b/TAO/tao/Fixed_Size_Argument_T.cpp @@ -21,6 +21,8 @@ TAO::In_Fixed_Size_Argument_T<S>::marshal (TAO_OutputCDR & cdr) return cdr << *this->x_; } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S> void TAO::In_Fixed_Size_Argument_T<S>::interceptor_param (Dynamic::Parameter & p) @@ -29,6 +31,8 @@ TAO::In_Fixed_Size_Argument_T<S>::interceptor_param (Dynamic::Parameter & p) p.mode = CORBA::PARAM_IN; } +#endif /* TAO_HAS_INTERCEPTORS */ + // =========================================================== template<typename S> @@ -45,6 +49,8 @@ TAO::Inout_Fixed_Size_Argument_T<S>::demarshal (TAO_InputCDR & cdr) return cdr >> *this->x_; } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S> void TAO::Inout_Fixed_Size_Argument_T<S>::interceptor_param ( @@ -55,6 +61,8 @@ TAO::Inout_Fixed_Size_Argument_T<S>::interceptor_param ( p.mode = CORBA::PARAM_INOUT; } +#endif /* TAO_HAS_INTERCEPTORS */ + // ============================================================== template<typename S> @@ -64,6 +72,8 @@ TAO::Out_Fixed_Size_Argument_T<S>::demarshal (TAO_InputCDR & cdr) return cdr >> this->x_; } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S> void TAO::Out_Fixed_Size_Argument_T<S>::interceptor_param ( @@ -74,6 +84,8 @@ TAO::Out_Fixed_Size_Argument_T<S>::interceptor_param ( p.mode = CORBA::PARAM_OUT; } +#endif /* TAO_HAS_INTERCEPTORS */ + // ============================================================ template<typename S> @@ -83,6 +95,8 @@ TAO::Ret_Fixed_Size_Argument_T<S>::demarshal (TAO_InputCDR & cdr) return cdr >> this->x_; } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S> void TAO::Ret_Fixed_Size_Argument_T<S>::interceptor_result (CORBA::Any * any) @@ -90,4 +104,6 @@ TAO::Ret_Fixed_Size_Argument_T<S>::interceptor_result (CORBA::Any * any) (*any) <<= this->x_; } +#endif /* TAO_HAS_INTERCEPTORS */ + #endif /* TAO_FIXED_SIZE_ARGUMENT_T_C */ diff --git a/TAO/tao/Fixed_Size_Argument_T.h b/TAO/tao/Fixed_Size_Argument_T.h index 1ba209d9cf8..c2cabced3e4 100644 --- a/TAO/tao/Fixed_Size_Argument_T.h +++ b/TAO/tao/Fixed_Size_Argument_T.h @@ -36,9 +36,9 @@ namespace TAO In_Fixed_Size_Argument_T (S const & x); virtual CORBA::Boolean marshal (TAO_OutputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ const S & arg (void) const; private: @@ -59,9 +59,9 @@ namespace TAO virtual CORBA::Boolean marshal (TAO_OutputCDR &); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S & arg (void); private: @@ -81,9 +81,9 @@ namespace TAO Out_Fixed_Size_Argument_T (S & x); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S & arg (void); private: @@ -103,9 +103,9 @@ namespace TAO Ret_Fixed_Size_Argument_T (void); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_result (CORBA::Any *); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S & arg (void); S excp (void); diff --git a/TAO/tao/Fixed_Size_SArgument_T.cpp b/TAO/tao/Fixed_Size_SArgument_T.cpp index cebb409762c..28408a12af2 100644 --- a/TAO/tao/Fixed_Size_SArgument_T.cpp +++ b/TAO/tao/Fixed_Size_SArgument_T.cpp @@ -21,6 +21,8 @@ TAO::In_Fixed_Size_SArgument_T<S>::demarshal (TAO_InputCDR &cdr) return cdr >> *this->x_; } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S> void TAO::In_Fixed_Size_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p) @@ -29,6 +31,8 @@ TAO::In_Fixed_Size_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p) p.mode = CORBA::PARAM_IN; } +#endif /* TAO_HAS_INTERCEPTORS */ + // =========================================================== template<typename S> @@ -45,6 +49,8 @@ TAO::Inout_Fixed_Size_SArgument_T<S>::demarshal (TAO_InputCDR & cdr) return cdr >> *this->x_; } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S> void TAO::Inout_Fixed_Size_SArgument_T<S>::interceptor_param ( @@ -55,6 +61,8 @@ TAO::Inout_Fixed_Size_SArgument_T<S>::interceptor_param ( p.mode = CORBA::PARAM_INOUT; } +#endif /* TAO_HAS_INTERCEPTORS */ + // ============================================================== template<typename S> @@ -64,6 +72,8 @@ TAO::Out_Fixed_Size_SArgument_T<S>::marshal (TAO_OutputCDR &cdr) return cdr << this->x_; } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S> void TAO::Out_Fixed_Size_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p) @@ -72,6 +82,8 @@ TAO::Out_Fixed_Size_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p) p.mode = CORBA::PARAM_OUT; } +#endif /* TAO_HAS_INTERCEPTORS */ + // ============================================================ template<typename S> @@ -81,6 +93,8 @@ TAO::Ret_Fixed_Size_SArgument_T<S>::marshal (TAO_OutputCDR & cdr) return cdr << *this->x_; } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S> void TAO::Ret_Fixed_Size_SArgument_T<S>::interceptor_result (CORBA::Any * any) @@ -88,4 +102,6 @@ TAO::Ret_Fixed_Size_SArgument_T<S>::interceptor_result (CORBA::Any * any) (*any) <<= *this->x_; } +#endif /* TAO_HAS_INTERCEPTORS */ + #endif /* TAO_FIXED_SIZE_SARGUMENT_T_C */ diff --git a/TAO/tao/Fixed_Size_SArgument_T.h b/TAO/tao/Fixed_Size_SArgument_T.h index 8b485656896..4ba6e2f0bfa 100644 --- a/TAO/tao/Fixed_Size_SArgument_T.h +++ b/TAO/tao/Fixed_Size_SArgument_T.h @@ -36,9 +36,9 @@ namespace TAO In_Fixed_Size_SArgument_T (void); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ const S & arg (void) const; private: @@ -59,9 +59,9 @@ namespace TAO virtual CORBA::Boolean marshal (TAO_OutputCDR &); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S & arg (void); private: @@ -81,9 +81,9 @@ namespace TAO Out_Fixed_Size_SArgument_T (void); virtual CORBA::Boolean marshal (TAO_OutputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S & arg (void); private: @@ -103,9 +103,9 @@ namespace TAO Ret_Fixed_Size_SArgument_T (void); virtual CORBA::Boolean marshal (TAO_OutputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_result (CORBA::Any *); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S & arg (void); private: diff --git a/TAO/tao/Object_Argument_T.cpp b/TAO/tao/Object_Argument_T.cpp index f3b9d225df0..bae71e85137 100644 --- a/TAO/tao/Object_Argument_T.cpp +++ b/TAO/tao/Object_Argument_T.cpp @@ -21,6 +21,8 @@ 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) @@ -29,6 +31,8 @@ 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,6 +50,8 @@ TAO::Inout_Object_Argument_T<S_ptr,S_traits>::demarshal (TAO_InputCDR & cdr) 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 ( @@ -56,6 +62,8 @@ 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> @@ -65,6 +73,8 @@ 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 ( @@ -75,6 +85,8 @@ 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> @@ -84,6 +96,8 @@ 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) @@ -91,4 +105,6 @@ 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 */ diff --git a/TAO/tao/Object_Argument_T.h b/TAO/tao/Object_Argument_T.h index fa23e08ef83..206d20fc631 100644 --- a/TAO/tao/Object_Argument_T.h +++ b/TAO/tao/Object_Argument_T.h @@ -41,9 +41,9 @@ namespace TAO In_Object_Argument_T (S_ptr x); virtual CORBA::Boolean marshal (TAO_OutputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S_ptr arg (void) const; private: @@ -64,9 +64,9 @@ namespace TAO virtual CORBA::Boolean marshal (TAO_OutputCDR &); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S_ptr & arg (void); private: @@ -86,9 +86,9 @@ namespace TAO Out_Object_Argument_T (S_out & x); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S_out arg (void); private: @@ -108,9 +108,9 @@ namespace TAO Ret_Object_Argument_T (void); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_result (CORBA::Any *); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S_ptr & arg (void); S_ptr excp (void); diff --git a/TAO/tao/Object_SArgument_T.cpp b/TAO/tao/Object_SArgument_T.cpp index 21f3d4d98c6..cdd83d2e90f 100644 --- a/TAO/tao/Object_SArgument_T.cpp +++ b/TAO/tao/Object_SArgument_T.cpp @@ -21,6 +21,8 @@ TAO::In_Object_SArgument_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::In_Object_SArgument_T<S_ptr,S_var>::interceptor_param ( @@ -31,6 +33,8 @@ TAO::In_Object_SArgument_T<S_ptr,S_var>::interceptor_param ( p.mode = CORBA::PARAM_IN; } +#endif /* TAO_HAS_INTERCEPTORS */ + // =========================================================== template<typename S_ptr, typename S_var> @@ -47,6 +51,8 @@ TAO::Inout_Object_SArgument_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::Inout_Object_SArgument_T<S_ptr,S_var>::interceptor_param ( @@ -57,6 +63,8 @@ TAO::Inout_Object_SArgument_T<S_ptr,S_var>::interceptor_param ( p.mode = CORBA::PARAM_INOUT; } +#endif /* TAO_HAS_INTERCEPTORS */ + // ============================================================== template<typename S_ptr, typename S_var, typename S_out> @@ -66,6 +74,8 @@ TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out>::marshal (TAO_OutputCDR &cdr) return cdr << this->x_.in (); } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S_ptr, typename S_var, typename S_out> void TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out>::interceptor_param ( @@ -76,6 +86,8 @@ TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out>::interceptor_param ( p.mode = CORBA::PARAM_OUT; } +#endif /* TAO_HAS_INTERCEPTORS */ + // ============================================================ template<typename S_ptr, typename S_var> @@ -85,6 +97,8 @@ TAO::Ret_Object_SArgument_T<S_ptr,S_var>::marshal (TAO_OutputCDR & cdr) return cdr << this->x_.in (); } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S_ptr, typename S_var> void TAO::Ret_Object_SArgument_T<S_ptr,S_var>::interceptor_result ( @@ -94,4 +108,6 @@ TAO::Ret_Object_SArgument_T<S_ptr,S_var>::interceptor_result ( (*any) <<= this->x_.in (); } +#endif /* TAO_HAS_INTERCEPTORS */ + #endif /* TAO_OBJECT_SARGUMENT_T_C */ diff --git a/TAO/tao/Object_SArgument_T.h b/TAO/tao/Object_SArgument_T.h index 9876bdad6bb..c906251067b 100644 --- a/TAO/tao/Object_SArgument_T.h +++ b/TAO/tao/Object_SArgument_T.h @@ -41,9 +41,9 @@ namespace TAO In_Object_SArgument_T (void); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S_ptr arg (void) const; private: @@ -64,9 +64,9 @@ namespace TAO virtual CORBA::Boolean marshal (TAO_OutputCDR &); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S_ptr & arg (void); private: @@ -86,9 +86,9 @@ namespace TAO Out_Object_SArgument_T (void); virtual CORBA::Boolean marshal (TAO_OutputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S_out arg (void); private: @@ -108,9 +108,9 @@ namespace TAO Ret_Object_SArgument_T (void); virtual CORBA::Boolean marshal (TAO_OutputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_result (CORBA::Any *); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S_ptr & arg (void); private: diff --git a/TAO/tao/Special_Basic_Argument_T.cpp b/TAO/tao/Special_Basic_Argument_T.cpp index 0fb3ae66072..3fe67efa366 100644 --- a/TAO/tao/Special_Basic_Argument_T.cpp +++ b/TAO/tao/Special_Basic_Argument_T.cpp @@ -21,6 +21,8 @@ TAO::In_Special_Basic_Argument_T<S,to_S,from_S>::marshal (TAO_OutputCDR & cdr) return cdr << from_S (this->x_); } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S, typename to_S, typename from_S> void TAO::In_Special_Basic_Argument_T<S,to_S,from_S>::interceptor_param ( @@ -31,6 +33,8 @@ TAO::In_Special_Basic_Argument_T<S,to_S,from_S>::interceptor_param ( p.mode = CORBA::PARAM_IN; } +#endif /* TAO_HAS_INTERCEPTORS */ + // =========================================================== template<typename S, typename to_S, typename from_S> @@ -51,6 +55,8 @@ TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S>::demarshal ( return cdr >> to_S (this->x_); } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S, typename to_S, typename from_S> void TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S>::interceptor_param ( @@ -61,6 +67,8 @@ TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S>::interceptor_param ( p.mode = CORBA::PARAM_INOUT; } +#endif /* TAO_HAS_INTERCEPTORS */ + // ============================================================== template<typename S, typename to_S, typename from_S> @@ -72,6 +80,8 @@ TAO::Out_Special_Basic_Argument_T<S,to_S,from_S>::demarshal ( return cdr >> to_S (this->x_); } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S, typename to_S, typename from_S> void TAO::Out_Special_Basic_Argument_T<S,to_S,from_S>::interceptor_param ( @@ -82,6 +92,8 @@ TAO::Out_Special_Basic_Argument_T<S,to_S,from_S>::interceptor_param ( p.mode = CORBA::PARAM_OUT; } +#endif /* TAO_HAS_INTERCEPTORS */ + // ============================================================ template<typename S, typename to_S, typename from_S> @@ -93,6 +105,8 @@ TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S>::demarshal ( return cdr >> to_S (this->x_); } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S, typename to_S, typename from_S> void TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S>::interceptor_result ( @@ -102,5 +116,7 @@ TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S>::interceptor_result ( (*any) <<= from_S (this->x_); } +#endif /* TAO_HAS_INTERCEPTORS */ + #endif /* TAO_SPECIAL_BASIC_ARGUMENT_T_C */ diff --git a/TAO/tao/Special_Basic_Argument_T.h b/TAO/tao/Special_Basic_Argument_T.h index 19c368ec6e9..6d405e4bbaa 100644 --- a/TAO/tao/Special_Basic_Argument_T.h +++ b/TAO/tao/Special_Basic_Argument_T.h @@ -38,9 +38,9 @@ namespace TAO In_Special_Basic_Argument_T (S const &); virtual CORBA::Boolean marshal (TAO_OutputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S const & arg (void); private: @@ -61,9 +61,9 @@ namespace TAO virtual CORBA::Boolean marshal (TAO_OutputCDR &); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S & arg (void); private: @@ -83,9 +83,9 @@ namespace TAO Out_Special_Basic_Argument_T (S & x); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S & arg (void); private: @@ -105,9 +105,9 @@ namespace TAO Ret_Special_Basic_Argument_T (void); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_result (CORBA::Any *); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S & arg (void); S excp (void); diff --git a/TAO/tao/Special_Basic_SArgument_T.cpp b/TAO/tao/Special_Basic_SArgument_T.cpp index 7b49823f9a5..c997f057d98 100644 --- a/TAO/tao/Special_Basic_SArgument_T.cpp +++ b/TAO/tao/Special_Basic_SArgument_T.cpp @@ -25,6 +25,8 @@ TAO::In_Special_Basic_SArgument_T<S,to_S,from_S>::demarshal ( return cdr >> to_S (this->x_); } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S, typename to_S, typename from_S> void TAO::In_Special_Basic_SArgument_T<S,to_S,from_S>::interceptor_param ( @@ -35,6 +37,8 @@ TAO::In_Special_Basic_SArgument_T<S,to_S,from_S>::interceptor_param ( p.mode = CORBA::PARAM_IN; } +#endif /* TAO_HAS_INTERCEPTORS */ + // =========================================================== template<typename S, typename to_S, typename from_S> @@ -55,6 +59,8 @@ TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S>::demarshal ( return cdr >> to_S (this->x_); } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S, typename to_S, typename from_S> void TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S>::interceptor_param ( @@ -65,6 +71,8 @@ TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S>::interceptor_param ( p.mode = CORBA::PARAM_INOUT; } +#endif /* TAO_HAS_INTERCEPTORS */ + // ============================================================== template<typename S, typename to_S, typename from_S> @@ -76,6 +84,8 @@ TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S>::marshal ( return cdr << from_S (this->x_); } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S, typename to_S, typename from_S> void TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S>::interceptor_param ( @@ -86,6 +96,8 @@ TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S>::interceptor_param ( p.mode = CORBA::PARAM_OUT; } +#endif /* TAO_HAS_INTERCEPTORS */ + // ============================================================== template<typename S, typename to_S, typename from_S> @@ -97,6 +109,8 @@ TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S>::marshal ( return cdr << from_S (this->x_); } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S, typename to_S, typename from_S> void TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S>::interceptor_result ( @@ -106,5 +120,7 @@ TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S>::interceptor_result ( (*any) <<= this->x_; } +#endif /* TAO_HAS_INTERCEPTORS */ + #endif /* TAO_SPECIAL_BASIC_SARGUMENT_T_C */ diff --git a/TAO/tao/Special_Basic_SArgument_T.h b/TAO/tao/Special_Basic_SArgument_T.h index 1399221066d..fcd4254358c 100644 --- a/TAO/tao/Special_Basic_SArgument_T.h +++ b/TAO/tao/Special_Basic_SArgument_T.h @@ -37,9 +37,9 @@ namespace TAO In_Special_Basic_SArgument_T (void); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S arg (void) const; private: @@ -60,9 +60,9 @@ namespace TAO virtual CORBA::Boolean marshal (TAO_OutputCDR &); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S & arg (void); private: @@ -82,9 +82,9 @@ namespace TAO Out_Special_Basic_SArgument_T (void); virtual CORBA::Boolean marshal (TAO_OutputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S & arg (void); private: @@ -104,9 +104,9 @@ namespace TAO Ret_Special_Basic_SArgument_T (void); virtual CORBA::Boolean marshal (TAO_OutputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_result (CORBA::Any *); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S & arg (void); private: diff --git a/TAO/tao/UB_String_Argument_T.cpp b/TAO/tao/UB_String_Argument_T.cpp index 034badc8d9d..a22d029b64c 100644 --- a/TAO/tao/UB_String_Argument_T.cpp +++ b/TAO/tao/UB_String_Argument_T.cpp @@ -24,6 +24,8 @@ TAO::In_UB_String_Argument_T<S>::marshal (TAO_OutputCDR & cdr) return cdr << this->x_; } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S> void TAO::In_UB_String_Argument_T<S>::interceptor_param (Dynamic::Parameter & p) @@ -32,6 +34,8 @@ TAO::In_UB_String_Argument_T<S>::interceptor_param (Dynamic::Parameter & p) p.mode = CORBA::PARAM_IN; } +#endif /* TAO_HAS_INTERCEPTORS */ + // =========================================================== template<typename S> @@ -49,6 +53,8 @@ TAO::Inout_UB_String_Argument_T<S>::demarshal (TAO_InputCDR & cdr) return cdr >> this->x_; } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S> void TAO::Inout_UB_String_Argument_T<S>::interceptor_param (Dynamic::Parameter & p) @@ -57,6 +63,8 @@ TAO::Inout_UB_String_Argument_T<S>::interceptor_param (Dynamic::Parameter & p) p.mode = CORBA::PARAM_INOUT; } +#endif /* TAO_HAS_INTERCEPTORS */ + // ============================================================== template<typename S, typename S_out> @@ -66,6 +74,8 @@ TAO::Out_UB_String_Argument_T<S,S_out>::demarshal (TAO_InputCDR & cdr) return cdr >> this->x_; } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S, typename S_out> void TAO::Out_UB_String_Argument_T<S,S_out>::interceptor_param ( @@ -76,6 +86,8 @@ TAO::Out_UB_String_Argument_T<S,S_out>::interceptor_param ( p.mode = CORBA::PARAM_OUT; } +#endif /* TAO_HAS_INTERCEPTORS */ + // ============================================================ template<typename S, typename S_var> @@ -85,6 +97,8 @@ TAO::Ret_UB_String_Argument_T<S,S_var>::demarshal (TAO_InputCDR & cdr) return cdr >> this->x_.out (); } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S, typename S_var> void TAO::Ret_UB_String_Argument_T<S,S_var>::interceptor_result (CORBA::Any * any) @@ -92,4 +106,6 @@ TAO::Ret_UB_String_Argument_T<S,S_var>::interceptor_result (CORBA::Any * any) (*any) <<= this->x_.in (); } +#endif /* TAO_HAS_INTERCEPTORS */ + #endif /* TAO_UB_STRING_ARGUMENT_T_C */ diff --git a/TAO/tao/UB_String_Argument_T.h b/TAO/tao/UB_String_Argument_T.h index a5d14c67e47..4553e79a9e2 100644 --- a/TAO/tao/UB_String_Argument_T.h +++ b/TAO/tao/UB_String_Argument_T.h @@ -35,9 +35,9 @@ namespace TAO In_UB_String_Argument_T (const S * x); virtual CORBA::Boolean marshal (TAO_OutputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ const S * arg (void) const; private: @@ -58,9 +58,9 @@ namespace TAO virtual CORBA::Boolean marshal (TAO_OutputCDR &); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S *& arg (void); private: @@ -80,9 +80,9 @@ namespace TAO Out_UB_String_Argument_T (S_out & x); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S *& arg (void); private: @@ -102,9 +102,9 @@ namespace TAO Ret_UB_String_Argument_T (void); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_result (CORBA::Any *); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S *& arg (void); S * excp (void); diff --git a/TAO/tao/UB_String_SArgument_T.cpp b/TAO/tao/UB_String_SArgument_T.cpp index da3a42de777..04844f9fea0 100644 --- a/TAO/tao/UB_String_SArgument_T.cpp +++ b/TAO/tao/UB_String_SArgument_T.cpp @@ -21,6 +21,8 @@ TAO::In_UB_String_SArgument_T<S,S_var>::demarshal (TAO_InputCDR &cdr) return cdr >> this->x_.out (); } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S, typename S_var> void TAO::In_UB_String_SArgument_T<S,S_var>::interceptor_param ( @@ -31,6 +33,8 @@ TAO::In_UB_String_SArgument_T<S,S_var>::interceptor_param ( p.mode = CORBA::PARAM_IN; } +#endif /* TAO_HAS_INTERCEPTORS */ + // =========================================================== template<typename S, typename S_var> @@ -47,6 +51,8 @@ TAO::Inout_UB_String_SArgument_T<S,S_var>::demarshal (TAO_InputCDR & cdr) return cdr >> this->x_.out (); } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S, typename S_var> void TAO::Inout_UB_String_SArgument_T<S,S_var>::interceptor_param ( @@ -57,6 +63,8 @@ TAO::Inout_UB_String_SArgument_T<S,S_var>::interceptor_param ( p.mode = CORBA::PARAM_INOUT; } +#endif /* TAO_HAS_INTERCEPTORS */ + // ============================================================== template<typename S, typename S_var> @@ -66,6 +74,8 @@ TAO::Out_UB_String_SArgument_T<S,S_var>::marshal (TAO_OutputCDR &cdr) return cdr << this->x_.in (); } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S, typename S_var> void TAO::Out_UB_String_SArgument_T<S,S_var>::interceptor_param ( @@ -76,6 +86,8 @@ TAO::Out_UB_String_SArgument_T<S,S_var>::interceptor_param ( p.mode = CORBA::PARAM_OUT; } +#endif /* TAO_HAS_INTERCEPTORS */ + // ============================================================ template<typename S, typename S_var> @@ -85,6 +97,8 @@ TAO::Ret_UB_String_SArgument_T<S,S_var>::marshal (TAO_OutputCDR & cdr) return cdr << this->x_.in (); } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S, typename S_var> void TAO::Ret_UB_String_SArgument_T<S,S_var>::interceptor_result (CORBA::Any * any) @@ -92,4 +106,6 @@ TAO::Ret_UB_String_SArgument_T<S,S_var>::interceptor_result (CORBA::Any * any) (*any) <<= this->x_.in (); } +#endif /* TAO_HAS_INTERCEPTORS */ + #endif /* TAO_UB_STRING_SARGUMENT_T_C */ diff --git a/TAO/tao/UB_String_SArgument_T.h b/TAO/tao/UB_String_SArgument_T.h index 4094f57b2ab..f6e2d0f6297 100644 --- a/TAO/tao/UB_String_SArgument_T.h +++ b/TAO/tao/UB_String_SArgument_T.h @@ -35,9 +35,9 @@ namespace TAO In_UB_String_SArgument_T (void); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ const S * arg (void) const; private: @@ -58,9 +58,9 @@ namespace TAO virtual CORBA::Boolean marshal (TAO_OutputCDR &); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S *& arg (void); private: @@ -80,9 +80,9 @@ namespace TAO Out_UB_String_SArgument_T (void); virtual CORBA::Boolean marshal (TAO_OutputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S *& arg (void); private: @@ -102,9 +102,9 @@ namespace TAO Ret_UB_String_SArgument_T (void); virtual CORBA::Boolean marshal (TAO_OutputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_result (CORBA::Any *); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S *& arg (void); private: diff --git a/TAO/tao/Var_Array_Argument_T.cpp b/TAO/tao/Var_Array_Argument_T.cpp index c7f04620b0a..5f358938220 100644 --- a/TAO/tao/Var_Array_Argument_T.cpp +++ b/TAO/tao/Var_Array_Argument_T.cpp @@ -23,6 +23,8 @@ TAO::In_Var_Array_Argument_T<S,S_slice,S_forany>::marshal ( return cdr << this->x_; } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S, typename S_slice, typename S_forany> void TAO::In_Var_Array_Argument_T<S,S_slice,S_forany>::interceptor_param ( @@ -33,6 +35,8 @@ TAO::In_Var_Array_Argument_T<S,S_slice,S_forany>::interceptor_param ( p.mode = CORBA::PARAM_IN; } +#endif /* TAO_HAS_INTERCEPTORS */ + // =========================================================== template<typename S, typename S_slice, typename S_forany> @@ -53,6 +57,8 @@ TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany>::demarshal ( return cdr >> this->x_; } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S, typename S_slice, typename S_forany> void TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany>::interceptor_param ( @@ -63,6 +69,8 @@ TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany>::interceptor_param ( p.mode = CORBA::PARAM_INOUT; } +#endif /* TAO_HAS_INTERCEPTORS */ + // ============================================================== template<typename S, @@ -84,6 +92,8 @@ TAO::Out_Var_Array_Argument_T<S,S_slice,S_var,S_out,S_forany,S_tag>::demarshal ( return cdr >> tmp; } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S, typename S_slice, typename S_var, @@ -98,6 +108,8 @@ interceptor_param (Dynamic::Parameter & p) p.mode = CORBA::PARAM_OUT; } +#endif /* TAO_HAS_INTERCEPTORS */ + // ============================================================ template<typename S, @@ -120,6 +132,8 @@ TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::demarshal ( return cdr >> tmp; } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S, typename S_slice, typename S_var, @@ -132,4 +146,6 @@ interceptor_result (CORBA::Any * any) (*any) <<= S_forany (this->x_.ptr ()); } +#endif /* TAO_HAS_INTERCEPTORS */ + #endif /* TAO_VAR_ARRAY_ARGUMENT_T_C */ diff --git a/TAO/tao/Var_Array_Argument_T.h b/TAO/tao/Var_Array_Argument_T.h index d489b0af7e4..342acbc5311 100644 --- a/TAO/tao/Var_Array_Argument_T.h +++ b/TAO/tao/Var_Array_Argument_T.h @@ -35,9 +35,9 @@ namespace TAO In_Var_Array_Argument_T (const S_slice * x); virtual CORBA::Boolean marshal (TAO_OutputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ const S_slice * arg (void) const; private: @@ -58,9 +58,9 @@ namespace TAO virtual CORBA::Boolean marshal (TAO_OutputCDR &); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S_slice * arg (void); private: @@ -85,9 +85,9 @@ namespace TAO Out_Var_Array_Argument_T (S_out x); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S_slice *& arg (void); private: @@ -111,9 +111,9 @@ namespace TAO Ret_Var_Array_Argument_T (void); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_result (CORBA::Any *); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S_slice *& arg (void); S_slice * excp (void); diff --git a/TAO/tao/Var_Array_SArgument_T.cpp b/TAO/tao/Var_Array_SArgument_T.cpp index 371d35cbe72..216b9071d74 100644 --- a/TAO/tao/Var_Array_SArgument_T.cpp +++ b/TAO/tao/Var_Array_SArgument_T.cpp @@ -22,6 +22,8 @@ TAO::In_Var_Array_SArgument_T<S,S_forany>::demarshal (TAO_InputCDR &cdr) return cdr >> tmp; } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S, typename S_forany> void TAO::In_Var_Array_SArgument_T<S,S_forany>::interceptor_param ( @@ -32,6 +34,8 @@ TAO::In_Var_Array_SArgument_T<S,S_forany>::interceptor_param ( p.mode = CORBA::PARAM_IN; } +#endif /* TAO_HAS_INTERCEPTORS */ + // =========================================================== template<typename S, typename S_forany> @@ -49,6 +53,8 @@ TAO::Inout_Var_Array_SArgument_T<S,S_forany>::demarshal (TAO_InputCDR & cdr) return cdr >> tmp; } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S, typename S_forany> void TAO::Inout_Var_Array_SArgument_T<S,S_forany>::interceptor_param ( @@ -59,6 +65,8 @@ TAO::Inout_Var_Array_SArgument_T<S,S_forany>::interceptor_param ( p.mode = CORBA::PARAM_INOUT; } +#endif /* TAO_HAS_INTERCEPTORS */ + // ============================================================== template<typename S_slice, typename S_var, typename S_forany> @@ -70,6 +78,8 @@ TAO::Out_Var_Array_SArgument_T<S_slice,S_var,S_forany>::marshal ( return cdr << S_forany (this->x_.ptr ()); } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S_slice, typename S_var, typename S_forany> void TAO::Out_Var_Array_SArgument_T<S_slice,S_var,S_forany>::interceptor_param ( @@ -80,6 +90,8 @@ TAO::Out_Var_Array_SArgument_T<S_slice,S_var,S_forany>::interceptor_param ( p.mode = CORBA::PARAM_OUT; } +#endif /* TAO_HAS_INTERCEPTORS */ + // ============================================================ template<typename S_slice, typename S_var, typename S_forany> @@ -91,6 +103,8 @@ TAO::Ret_Var_Array_SArgument_T<S_slice,S_var,S_forany>::marshal ( return cdr << S_forany (this->x_.ptr ()); } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S_slice, typename S_var, typename S_forany> void TAO::Ret_Var_Array_SArgument_T<S_slice,S_var,S_forany>::interceptor_result ( @@ -100,4 +114,6 @@ TAO::Ret_Var_Array_SArgument_T<S_slice,S_var,S_forany>::interceptor_result ( (*any) <<= S_forany (this->x_.ptr ()); } +#endif /* TAO_HAS_INTERCEPTORS */ + #endif /* TAO_VAR_ARRAY_SARGUMENT_T_C */ diff --git a/TAO/tao/Var_Array_SArgument_T.h b/TAO/tao/Var_Array_SArgument_T.h index 1c0e5a95752..70f5caad9fa 100644 --- a/TAO/tao/Var_Array_SArgument_T.h +++ b/TAO/tao/Var_Array_SArgument_T.h @@ -35,9 +35,9 @@ namespace TAO In_Var_Array_SArgument_T (void); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ const S & arg (void) const; private: @@ -58,9 +58,9 @@ namespace TAO virtual CORBA::Boolean marshal (TAO_OutputCDR &); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S & arg (void); private: @@ -80,9 +80,9 @@ namespace TAO Out_Var_Array_SArgument_T (void); virtual CORBA::Boolean marshal (TAO_OutputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S_slice *& arg (void); private: @@ -102,9 +102,9 @@ namespace TAO Ret_Var_Array_SArgument_T (void); virtual CORBA::Boolean marshal (TAO_OutputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_result (CORBA::Any *); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S_slice *& arg (void); private: diff --git a/TAO/tao/Var_Size_Argument_T.cpp b/TAO/tao/Var_Size_Argument_T.cpp index 0445fa652f3..5d28dae9742 100644 --- a/TAO/tao/Var_Size_Argument_T.cpp +++ b/TAO/tao/Var_Size_Argument_T.cpp @@ -21,6 +21,8 @@ TAO::In_Var_Size_Argument_T<S>::marshal (TAO_OutputCDR & cdr) return cdr << *this->x_; } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S> void TAO::In_Var_Size_Argument_T<S>::interceptor_param (Dynamic::Parameter & p) @@ -29,6 +31,8 @@ TAO::In_Var_Size_Argument_T<S>::interceptor_param (Dynamic::Parameter & p) p.mode = CORBA::PARAM_IN; } +#endif /* TAO_HAS_INTERCEPTORS */ + // =========================================================== template<typename S> @@ -45,6 +49,8 @@ TAO::Inout_Var_Size_Argument_T<S>::demarshal (TAO_InputCDR & cdr) return cdr >> *this->x_; } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S> void TAO::Inout_Var_Size_Argument_T<S>::interceptor_param (Dynamic::Parameter & p) @@ -53,6 +59,8 @@ TAO::Inout_Var_Size_Argument_T<S>::interceptor_param (Dynamic::Parameter & p) p.mode = CORBA::PARAM_INOUT; } +#endif /* TAO_HAS_INTERCEPTORS */ + // ============================================================== template<typename S, typename S_out> @@ -60,13 +68,11 @@ CORBA::Boolean TAO::Out_Var_Size_Argument_T<S,S_out>::demarshal (TAO_InputCDR & cdr) { this->x_ = new S; - - /*ACE_NEW_RETURN (this->x_, - S, - 0); */ return cdr >> *this->x_; } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S, typename S_out> void TAO::Out_Var_Size_Argument_T<S,S_out>::interceptor_param ( @@ -77,6 +83,8 @@ TAO::Out_Var_Size_Argument_T<S,S_out>::interceptor_param ( p.mode = CORBA::PARAM_OUT; } +#endif /* TAO_HAS_INTERCEPTORS */ + // ============================================================ template<typename S, typename S_var> @@ -91,6 +99,8 @@ TAO::Ret_Var_Size_Argument_T<S,S_var>::demarshal (TAO_InputCDR & cdr) return cdr >> this->x_.inout (); } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S, typename S_var> void TAO::Ret_Var_Size_Argument_T<S,S_var>::interceptor_result (CORBA::Any * any) @@ -98,4 +108,6 @@ TAO::Ret_Var_Size_Argument_T<S,S_var>::interceptor_result (CORBA::Any * any) (*any) <<= this->x_.in (); } +#endif /* TAO_HAS_INTERCEPTORS */ + #endif /* TAO_VAR_SIZE_ARGUMENT_T_C */ diff --git a/TAO/tao/Var_Size_Argument_T.h b/TAO/tao/Var_Size_Argument_T.h index c7c0ccf3400..88b81297218 100644 --- a/TAO/tao/Var_Size_Argument_T.h +++ b/TAO/tao/Var_Size_Argument_T.h @@ -35,9 +35,9 @@ namespace TAO In_Var_Size_Argument_T (S const & x); virtual CORBA::Boolean marshal (TAO_OutputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ const S & arg (void) const; private: @@ -58,9 +58,9 @@ namespace TAO virtual CORBA::Boolean marshal (TAO_OutputCDR &); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S & arg (void); private: @@ -80,9 +80,9 @@ namespace TAO Out_Var_Size_Argument_T (S_out x); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S *& arg (void); private: @@ -102,9 +102,9 @@ namespace TAO Ret_Var_Size_Argument_T (void); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_result (CORBA::Any *); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S *& arg (void); S * excp (void); diff --git a/TAO/tao/Var_Size_SArgument_T.cpp b/TAO/tao/Var_Size_SArgument_T.cpp index bfca13434f6..682b18ac6a3 100644 --- a/TAO/tao/Var_Size_SArgument_T.cpp +++ b/TAO/tao/Var_Size_SArgument_T.cpp @@ -21,6 +21,8 @@ TAO::In_Var_Size_SArgument_T<S>::demarshal (TAO_InputCDR &cdr) return cdr >> *this->x_; } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S> void TAO::In_Var_Size_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p) @@ -29,6 +31,8 @@ TAO::In_Var_Size_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p) p.mode = CORBA::PARAM_IN; } +#endif /* TAO_HAS_INTERCEPTORS */ + // =========================================================== template<typename S> @@ -45,6 +49,8 @@ TAO::Inout_Var_Size_SArgument_T<S>::demarshal (TAO_InputCDR & cdr) return cdr >> *this->x_; } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S> void TAO::Inout_Var_Size_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p) @@ -53,6 +59,8 @@ TAO::Inout_Var_Size_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p) p.mode = CORBA::PARAM_INOUT; } +#endif /* TAO_HAS_INTERCEPTORS */ + // ============================================================== template<typename S, typename S_var> @@ -62,6 +70,8 @@ TAO::Out_Var_Size_SArgument_T<S,S_var>::marshal (TAO_OutputCDR &cdr) return cdr << this->x_.in (); } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S, typename S_var> void TAO::Out_Var_Size_SArgument_T<S,S_var>::interceptor_param ( @@ -72,6 +82,8 @@ TAO::Out_Var_Size_SArgument_T<S,S_var>::interceptor_param ( p.mode = CORBA::PARAM_OUT; } +#endif /* TAO_HAS_INTERCEPTORS */ + // ============================================================ template<typename S, typename S_var> @@ -80,6 +92,8 @@ TAO::Ret_Var_Size_SArgument_T<S,S_var>::marshal (TAO_OutputCDR & cdr) { return cdr << this->x_.in (); } +#if TAO_HAS_INTERCEPTORS == 1 + template<typename S, typename S_var> void @@ -88,4 +102,6 @@ TAO::Ret_Var_Size_SArgument_T<S,S_var>::interceptor_result (CORBA::Any * any) (*any) <<= this->x_.in (); } +#endif /* TAO_HAS_INTERCEPTORS */ + #endif /* TAO_VAR_SIZE_SARGUMENT_T_C */ diff --git a/TAO/tao/Var_Size_SArgument_T.h b/TAO/tao/Var_Size_SArgument_T.h index 6ab8fcd6e4a..5f1cb0a7a3e 100644 --- a/TAO/tao/Var_Size_SArgument_T.h +++ b/TAO/tao/Var_Size_SArgument_T.h @@ -35,9 +35,9 @@ namespace TAO In_Var_Size_SArgument_T (void); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ const S & arg (void) const; private: @@ -58,9 +58,9 @@ namespace TAO virtual CORBA::Boolean marshal (TAO_OutputCDR &); virtual CORBA::Boolean demarshal (TAO_InputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S & arg (void); private: @@ -80,9 +80,9 @@ namespace TAO Out_Var_Size_SArgument_T (void); virtual CORBA::Boolean marshal (TAO_OutputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_param (Dynamic::Parameter &); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S *& arg (void); private: @@ -102,9 +102,9 @@ namespace TAO Ret_Var_Size_SArgument_T (void); virtual CORBA::Boolean marshal (TAO_OutputCDR &); - +#if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_result (CORBA::Any *); - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ S *& arg (void); private: diff --git a/TAO/tao/operation_details.cpp b/TAO/tao/operation_details.cpp index 6aa3fab038f..984a957db88 100644 --- a/TAO/tao/operation_details.cpp +++ b/TAO/tao/operation_details.cpp @@ -73,6 +73,8 @@ TAO_Operation_Details::demarshal_args (TAO_InputCDR &cdr) return true; } +#if TAO_HAS_INTERCEPTORS == 1 + bool TAO_Operation_Details::parameter_list (Dynamic::ParameterList ¶m_list) { @@ -85,6 +87,7 @@ TAO_Operation_Details::parameter_list (Dynamic::ParameterList ¶m_list) return true; } +#endif /* TAO_HAS_INTERCEPTORS == 1 */ bool TAO_Operation_Details::exception_list (Dynamic::ExceptionList &exception_list) @@ -106,6 +109,8 @@ TAO_Operation_Details::exception_list (Dynamic::ExceptionList &exception_list) } +#if TAO_HAS_INTERCEPTORS == 1 + bool TAO_Operation_Details::result (CORBA::Any *any) { @@ -114,3 +119,6 @@ TAO_Operation_Details::result (CORBA::Any *any) return true; } + +#endif /* TAO_HAS_INTERCEPTORS == 1 */ + diff --git a/TAO/tao/operation_details.h b/TAO/tao/operation_details.h index 7f217584581..0002eed3f1d 100644 --- a/TAO/tao/operation_details.h +++ b/TAO/tao/operation_details.h @@ -141,9 +141,11 @@ public: * the list of parameters passed by the operation, exceptions * declared for the operation, and the result when available. */ - bool parameter_list (Dynamic::ParameterList &); bool exception_list (Dynamic::ExceptionList &); +#if TAO_HAS_INTERCEPTORS == 1 + bool parameter_list (Dynamic::ParameterList &); bool result (CORBA::Any *); +#endif /* TAO_HAS_INTERCEPTORS == 1 */ //@} /// Accessors for the argumet list |