diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-06-20 06:07:59 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-06-20 06:07:59 +0000 |
| commit | d438c23bfdd7a756a01dd94683bb40841b63344a (patch) | |
| tree | 2d40c5969107d408f9c60168507704f3969986aa /TAO/tao/Var_Array_Argument_T.h | |
| parent | 6867b37ce03d12198c98bb2914a481d5acc32f40 (diff) | |
| download | ATCD-d438c23bfdd7a756a01dd94683bb40841b63344a.tar.gz | |
ChangeLogTag: Mon Jun 19 12:11:09 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao/Var_Array_Argument_T.h')
| -rw-r--r-- | TAO/tao/Var_Array_Argument_T.h | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/TAO/tao/Var_Array_Argument_T.h b/TAO/tao/Var_Array_Argument_T.h index 00f8c3bf8b6..cf5c2a8f5e3 100644 --- a/TAO/tao/Var_Array_Argument_T.h +++ b/TAO/tao/Var_Array_Argument_T.h @@ -31,9 +31,10 @@ namespace TAO * @brief IN stub argument of variable size element array. * */ +<<<<<<< Var_Array_Argument_T.h template<typename S_forany, - typename Insert_Policy> - class In_Var_Array_Argument_T : public InArgument, private Insert_Policy + template <typename> class Insert_Policy> + class In_Var_Array_Argument_T : public InArgument { public: In_Var_Array_Argument_T (const typename S_forany::_slice_type * x); @@ -55,8 +56,8 @@ namespace TAO * */ template<typename S_forany, - typename Insert_Policy> - class Inout_Var_Array_Argument_T : public InoutArgument, private Insert_Policy + template <typename> class Insert_Policy> + class Inout_Var_Array_Argument_T : public InoutArgument { public: Inout_Var_Array_Argument_T (typename S_forany::_slice_type *&x); @@ -80,8 +81,8 @@ namespace TAO */ template<typename S_out, typename S_forany, - typename Insert_Policy> - class Out_Var_Array_Argument_T : public OutArgument, private Insert_Policy + template <typename> class Insert_Policy> + class Out_Var_Array_Argument_T : public OutArgument { public: Out_Var_Array_Argument_T (S_out x); @@ -104,8 +105,8 @@ namespace TAO */ template<typename S_var, typename S_forany, - typename Insert_Policy> - class Ret_Var_Array_Argument_T : public RetArgument, private Insert_Policy + template <typename> class Insert_Policy> + class Ret_Var_Array_Argument_T : public RetArgument { public: Ret_Var_Array_Argument_T (void); @@ -121,6 +122,9 @@ namespace TAO private: S_var x_; +#if TAO_HAS_INTERCEPTORS == 1 + Insert_Policy <S> insert_policy_; +#endif /* TAO_HAS_INTERCEPTORS == 1 */ }; /** @@ -131,7 +135,7 @@ namespace TAO */ template<typename T_out, typename T_forany, - typename Insert_Policy> + template <typename> class Insert_Policy> struct Var_Array_Arg_Traits_T { typedef typename T_forany::_slice_type * ret_type; |