summaryrefslogtreecommitdiff
path: root/TAO/tao/Fixed_Array_Argument_T.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/Fixed_Array_Argument_T.cpp')
-rw-r--r--TAO/tao/Fixed_Array_Argument_T.cpp34
1 files changed, 9 insertions, 25 deletions
diff --git a/TAO/tao/Fixed_Array_Argument_T.cpp b/TAO/tao/Fixed_Array_Argument_T.cpp
index 4d02a03d3bf..64cb1090356 100644
--- a/TAO/tao/Fixed_Array_Argument_T.cpp
+++ b/TAO/tao/Fixed_Array_Argument_T.cpp
@@ -23,8 +23,6 @@ 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 (
@@ -35,8 +33,6 @@ 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>
@@ -57,8 +53,6 @@ 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 (
@@ -69,8 +63,6 @@ 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>
@@ -82,8 +74,6 @@ 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 (
@@ -94,14 +84,12 @@ 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,
- typename S_slice,
- typename S_var,
- typename S_forany,
+template<typename S,
+ typename S_slice,
+ typename S_var,
+ typename S_forany,
typename S_tag>
CORBA::Boolean
TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::demarshal (
@@ -111,19 +99,17 @@ TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::demarshal (
typedef TAO::Array_Traits<S,S_slice,S_tag> ARRAY_TRAITS;
S_slice * tmp_ptr = 0;
ACE_ALLOCATOR_RETURN (tmp_ptr,
- ARRAY_TRAITS::alloc (),
+ ARRAY_TRAITS::tao_alloc (),
0);
this->x_ = tmp_ptr;
S_forany tmp (this->x_.ptr ());
return cdr >> tmp;
}
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S,
- typename S_slice,
- typename S_var,
- typename S_forany,
+template<typename S,
+ typename S_slice,
+ typename S_var,
+ typename S_forany,
typename S_tag>
void
TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::
@@ -132,6 +118,4 @@ interceptor_result (CORBA::Any * any)
(*any) <<= S_forany (this->x_.ptr ());
}
-#endif /* TAO_HAS_INTERCEPTORS */
-
#endif /* TAO_FIXED_ARRAY_ARGUMENT_T_C */