diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-04-29 11:37:24 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-04-29 11:37:24 +0000 |
| commit | f9fe7e5db7bd8995b4dcdc5e0517975541a6317a (patch) | |
| tree | 75b85494988a9946d65127e56d0cd6d2284902f4 | |
| parent | b21cda46c2002e58b7967cc73a2831c203964ef5 (diff) | |
| download | ATCD-f9fe7e5db7bd8995b4dcdc5e0517975541a6317a.tar.gz | |
ChangeLogTag: Fri Apr 29 11:33:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/tao/Fixed_Array_Argument_T.inl | 26 |
2 files changed, 25 insertions, 7 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 1e71bba5fe0..b18460d7d9c 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Fri Apr 29 11:33:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/Array_VarOut_T.inl: + In TAO_Array_Forany_T<T,T_slice,TAG>::in also use the workaround + for Visual Age 6. + Fri Apr 29 11:14:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * tao/PortableServer/POAManagerA.cpp: diff --git a/TAO/tao/Fixed_Array_Argument_T.inl b/TAO/tao/Fixed_Array_Argument_T.inl index 0c6947bdbe1..58b57f35a05 100644 --- a/TAO/tao/Fixed_Array_Argument_T.inl +++ b/TAO/tao/Fixed_Array_Argument_T.inl @@ -2,12 +2,14 @@ // // $Id$ -template<typename S, typename S_slice, typename S_forany> +template<typename S, + typename S_slice, + typename S_forany> ACE_INLINE TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany>:: In_Fixed_Array_Argument_T (const S_slice * x) : x_ ( -#if defined (_MSC_VER) && _MSC_VER <= 1200 +#if (defined (_MSC_VER) && _MSC_VER <= 1200) || (defined (__IBMCPP__) && (__IBMCPP__ <= 600)) // @@ (OO) MSVC++ 6 can't handle the const_cast<> in the // multi-dimensional array case so C-style // "sledgehammer" cast instead (reinterpret_cast<> @@ -22,7 +24,9 @@ In_Fixed_Array_Argument_T (const S_slice * x) { } -template<typename S, typename S_slice, typename S_forany> +template<typename S, + typename S_slice, + typename S_forany> ACE_INLINE const S_slice * TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany>::arg (void) const @@ -32,14 +36,18 @@ TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany>::arg (void) const // =========================================================================== -template<typename S, typename S_slice, typename S_forany> +template<typename S, + typename S_slice, + typename S_forany> ACE_INLINE TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany>:: Inout_Fixed_Array_Argument_T (S_slice *& x) : x_ (x) {} -template<typename S, typename S_slice, typename S_forany> +template<typename S, + typename S_slice, + typename S_forany> ACE_INLINE S_slice * TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany>::arg (void) @@ -49,13 +57,17 @@ TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany>::arg (void) // =========================================================================== -template<typename S, typename S_slice, typename S_forany> +template<typename S, + typename S_slice, + typename S_forany> ACE_INLINE TAO::Out_Fixed_Array_Argument_T<S,S_slice,S_forany>::Out_Fixed_Array_Argument_T (S_slice *&x) : x_ (x) {} -template<typename S, typename S_slice, typename S_forany> +template<typename S, + typename S_slice, + typename S_forany> ACE_INLINE S_slice *& TAO::Out_Fixed_Array_Argument_T<S,S_slice,S_forany>::arg (void) |