diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-12-09 21:59:13 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-12-09 21:59:13 +0000 |
| commit | f2c900324bf816418b59d57e2477b7416b718e09 (patch) | |
| tree | a6760c4f220a975207e8c41fed6ec287349d3c3d | |
| parent | a2ba14b4ded7e8075c16926be745946bc7a65d50 (diff) | |
| download | ATCD-f2c900324bf816418b59d57e2477b7416b718e09.tar.gz | |
ChangeLogTag: Fri Dec 9 21:48:48 UTC 2005 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 18 | ||||
| -rw-r--r-- | TAO/tao/Array_VarOut_T.h | 4 | ||||
| -rw-r--r-- | TAO/tao/Array_VarOut_T.inl | 2 |
3 files changed, 21 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 7ef33dc1188..338bafc0fe0 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,21 @@ +Fri Dec 9 21:48:48 UTC 2005 Jeff Parsons <j.parsons@vanderbilt.edu> + + * tao/Array_VarOut_T.h: + * tao/Array_VarOut_T.inl: + + In the TAO_Array_Forany_T<> template class: + + - Changed initialization values for the CORBA::Boolean + nocopy_ member from '0' to 'false'. + + - Removed the 'const' qualifier from the nocopy_ member. + This member gets assigned to in the class assignment + operator, and because of this, tools like insure++ + complain. It's a mystery why C++ compilers don't + complain as well. This fix closes [BUGID:2326]. Thanks + to Brian Buesker <bbuesker@qualcomm.com> for reporting + the problem. + Thu Dec 8 16:37:06 2005 Ossama Othman <ossama@dre.vanderbilt.edu> * examples/RTCORBA/Activity/Activity.mpc: diff --git a/TAO/tao/Array_VarOut_T.h b/TAO/tao/Array_VarOut_T.h index 86ce5168d73..3a923436eba 100644 --- a/TAO/tao/Array_VarOut_T.h +++ b/TAO/tao/Array_VarOut_T.h @@ -172,7 +172,7 @@ class TAO_Array_Forany_T public: TAO_Array_Forany_T (void); TAO_Array_Forany_T (T_slice *, - CORBA::Boolean nocopy = 0); + CORBA::Boolean nocopy = false); TAO_Array_Forany_T (const TAO_Array_Forany_T<T,T_slice,TAG> &); ~TAO_Array_Forany_T (void); @@ -200,7 +200,7 @@ public: static T_slice * tao_alloc (void); private: T_slice * ptr_; - const CORBA::Boolean nocopy_; + CORBA::Boolean nocopy_; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Array_VarOut_T.inl b/TAO/tao/Array_VarOut_T.inl index 6be6b641283..ad0e6aba6b0 100644 --- a/TAO/tao/Array_VarOut_T.inl +++ b/TAO/tao/Array_VarOut_T.inl @@ -245,7 +245,7 @@ template<typename T, typename T_slice, typename TAG> ACE_INLINE TAO_Array_Forany_T<T,T_slice,TAG>::TAO_Array_Forany_T (void) : ptr_ (0), - nocopy_ (0) + nocopy_ (false) {} template<typename T, typename T_slice, typename TAG> |