diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-08-22 18:11:21 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-08-22 18:11:21 +0000 |
| commit | 9fd52124d9c074582072d3d759d74ba9b9e1ccbe (patch) | |
| tree | a6ab38fb6e7a37d884942310837cbdc259154d3c | |
| parent | 4970d81d1683995bdf972f6075e03d779f32bb91 (diff) | |
| download | ATCD-9fd52124d9c074582072d3d759d74ba9b9e1ccbe.tar.gz | |
ChangeLogTag: Mon Aug 22 13:23:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/tao/Array_VarOut_T.h | 2 | ||||
| -rw-r--r-- | TAO/tao/Array_VarOut_T.inl | 4 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/Var_Array_SArgument_T.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/Var_Array_SArgument_T.h | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/TAO/tao/Array_VarOut_T.h b/TAO/tao/Array_VarOut_T.h index 45b0acd196c..f2e07430c24 100644 --- a/TAO/tao/Array_VarOut_T.h +++ b/TAO/tao/Array_VarOut_T.h @@ -169,7 +169,7 @@ class TAO_Array_Forany_T { public: TAO_Array_Forany_T (void); - TAO_Array_Forany_T (const T_slice *, + TAO_Array_Forany_T (T_slice *, CORBA::Boolean nocopy = 0); TAO_Array_Forany_T (const TAO_Array_Forany_T<T,T_slice,TAG> &); ~TAO_Array_Forany_T (void); diff --git a/TAO/tao/Array_VarOut_T.inl b/TAO/tao/Array_VarOut_T.inl index 5eda36c3566..8bf64484bec 100644 --- a/TAO/tao/Array_VarOut_T.inl +++ b/TAO/tao/Array_VarOut_T.inl @@ -247,10 +247,10 @@ TAO_Array_Forany_T<T,T_slice,TAG>::TAO_Array_Forany_T (void) template<typename T, typename T_slice, typename TAG> ACE_INLINE TAO_Array_Forany_T<T,T_slice,TAG>::TAO_Array_Forany_T ( - const T_slice * p, + T_slice * p, CORBA::Boolean nocopy ) - : ptr_ (const_cast <T_slice *>(p)), + : ptr_ (p), nocopy_ (nocopy) {} diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp index 1d90e7de4bc..d98e9d30b37 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 (this->x_)); + this->Insert_Policy::any_insert (any, S_forany (const_cast <S_slice *> (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 (this->x_)); + this->Insert_Policy::any_insert (any, S_forany (const_cast <S_slice *> (this->x_))); } #endif /* TAO_HAS_INTERCEPTORS */ diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp b/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp index 60218a2d35c..b7009ed3baa 100644 --- a/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp @@ -84,7 +84,7 @@ TAO::Inout_Var_Array_SArgument_T<S, Insert_Policy>::interceptor_value ( CORBA::Any *any) const { - this->Insert_Policy::any_insert (any, S_forany (this->x_)); + this->Insert_Policy::any_insert (any, S_forany (const_cast <S_slice *>(this->x_))); } #endif /* TAO_HAS_INTERCEPTORS */ diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.h b/TAO/tao/PortableServer/Var_Array_SArgument_T.h index d5f607cba2f..ab4418314e6 100644 --- a/TAO/tao/PortableServer/Var_Array_SArgument_T.h +++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.h @@ -72,7 +72,7 @@ namespace TAO S_slice * arg (void); private: - mutable S x_; + S x_; }; /** |