diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-07-07 19:04:01 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-07-07 19:04:01 +0000 |
| commit | 9d92d87f2b9eba618102682a648391a02376c9cd (patch) | |
| tree | bb65e015ceee5c2479bfb86b27a55112ceb53da1 | |
| parent | 8f7a9c24ea424cdb72e25cdaeb2de3540a1ab6a9 (diff) | |
| download | ATCD-9d92d87f2b9eba618102682a648391a02376c9cd.tar.gz | |
ChangeLogTag: Mon Jul 7 14:00:01 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog_ref | 7 | ||||
| -rw-r--r-- | TAO/tao/Var_Array_Argument_T.cpp | 16 | ||||
| -rw-r--r-- | TAO/tao/Var_Array_Argument_T.h | 6 |
3 files changed, 24 insertions, 5 deletions
diff --git a/TAO/ChangeLog_ref b/TAO/ChangeLog_ref index 2d1608aaa59..47deb72a3e8 100644 --- a/TAO/ChangeLog_ref +++ b/TAO/ChangeLog_ref @@ -1,3 +1,10 @@ +Mon Jul 7 14:00:01 2003 Jeff Parsons <j.parsons@vanderbilt.edu> + + * tao/Var_Array_Argument_T.cpp: + * tao/Var_Array_Argument_T.h: + + Added template parameter required by use of TAO::Array_Traits<>. + Mon Jul 7 06:03:26 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> * tao/Array_VarOut_T.inl: diff --git a/TAO/tao/Var_Array_Argument_T.cpp b/TAO/tao/Var_Array_Argument_T.cpp index d5ccfa010a1..9cc187dd76d 100644 --- a/TAO/tao/Var_Array_Argument_T.cpp +++ b/TAO/tao/Var_Array_Argument_T.cpp @@ -87,8 +87,12 @@ TAO::Inout_Var_Array_Argument_T<S,S_forany>::interceptor_replace ( // ============================================================== -template<typename S, typename S_var, typename S_out, typename S_forany> -TAO::Out_Var_Array_Argument_T<S,S_var,S_out,S_forany>:: +template<typename S, + typename S_slice, + typename S_var, + typename S_out, + typename S_forany> +TAO::Out_Var_Array_Argument_T<S,S_slice,S_var,S_out,S_forany>:: Out_Var_Array_Argument_T (S_out x) { typedef TAO::Array_Traits<S,S_slice> ARRAY_TRAITS; @@ -97,9 +101,13 @@ Out_Var_Array_Argument_T (S_out x) this->x_ = x.ptr (); } -template<typename S, typename S_var, typename S_out, typename S_forany> +template<typename S, + typename S_slice, + typename S_var, + typename S_out, + typename S_forany> CORBA::Boolean -TAO::Out_Var_Array_Argument_T<S,S_var,S_out,S_forany>::demarshal ( +TAO::Out_Var_Array_Argument_T<S,S_slice,S_var,S_out,S_forany>::demarshal ( TAO_InputCDR & cdr ) { diff --git a/TAO/tao/Var_Array_Argument_T.h b/TAO/tao/Var_Array_Argument_T.h index c977106dff2..e7b0ce0d276 100644 --- a/TAO/tao/Var_Array_Argument_T.h +++ b/TAO/tao/Var_Array_Argument_T.h @@ -72,7 +72,11 @@ namespace TAO * @brief OUT stub argument of variable size element array. * */ - template<typename S, typename S_var, typename S_out, typename S_forany> + template<typename S, + typename S_slice, + typename S_var, + typename S_out, + typename S_forany> class Out_Var_Array_Argument_T : public Argument { public: |