diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-08-23 10:02:47 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-08-23 10:02:47 +0000 |
| commit | d51faff7bc3e09e0b7330a3cf3a1597cc49448f6 (patch) | |
| tree | 2702fd84bdf0027b1d1fbaf5c1c89e952a47c599 | |
| parent | 19dbfef5cdb6d06b6d53891f25ecadd0196b53cc (diff) | |
| download | ATCD-d51faff7bc3e09e0b7330a3cf3a1597cc49448f6.tar.gz | |
ChangeLogTag: Tue Aug 23 10:02:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/Fixed_Array_SArgument_T.h | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp index d98e9d30b37..1d90e7de4bc 100644 --- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp @@ -84,7 +84,7 @@ TAO::Inout_Fixed_Array_SArgument_T<S, Insert_Policy>::interceptor_value ( CORBA::Any *any) const { - this->Insert_Policy::any_insert (any, S_forany (const_cast <S_slice *> (this->x_))); + this->Insert_Policy::any_insert (any, S_forany (this->x_)); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -117,7 +117,7 @@ TAO::Out_Fixed_Array_SArgument_T<S, Insert_Policy>::interceptor_value ( CORBA::Any *any) const { - this->Insert_Policy::any_insert (any, S_forany (const_cast <S_slice *> (this->x_))); + this->Insert_Policy::any_insert (any, S_forany (this->x_)); } #endif /* TAO_HAS_INTERCEPTORS */ diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h index 369fd9afe4d..4fb052bbfc7 100644 --- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h +++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h @@ -54,12 +54,15 @@ namespace TAO * * @brief INOUT skeleton argument of fixed size element array. * + * @todo The mutable for x_ can be removed when vc6 has been dropped */ template<typename S, typename S_slice, typename S_forany, typename Insert_Policy> - class Inout_Fixed_Array_SArgument_T : public InoutArgument, private Insert_Policy + class Inout_Fixed_Array_SArgument_T : + public InoutArgument, + private Insert_Policy { public: Inout_Fixed_Array_SArgument_T (void); @@ -72,7 +75,7 @@ namespace TAO S_slice * arg (void); private: - S x_; + mutable S x_; }; /** @@ -80,6 +83,7 @@ namespace TAO * * @brief OUT skeleton argument of fixed size element array. * + * @todo The mutable for x_ can be removed when vc6 has been dropped */ template<typename S, typename S_slice, @@ -97,7 +101,7 @@ namespace TAO S_slice * arg (void); private: - S x_; + mutable S x_; }; /** |