diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-10-31 16:52:15 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-10-31 16:52:15 +0000 |
| commit | b0116d6d23e8bf727ea63a482ab4c59ba5d570b3 (patch) | |
| tree | cfef61154c5a0c72088eb747e32a4ee8395d5d12 | |
| parent | fd6688dc8fda93a88264d1d21261a2cf08a240f2 (diff) | |
| download | ATCD-b0116d6d23e8bf727ea63a482ab4c59ba5d570b3.tar.gz | |
ChangeLogTag: Thu Oct 31 10:50:16 2002 Jeff Parsons <parsons@isis-server.isis.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/tao/ValueBase.h | 2 | ||||
| -rw-r--r-- | TAO/tao/ValueBase.i | 5 |
3 files changed, 11 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 0d7d057832f..f4889a68135 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Thu Oct 31 10:50:16 2002 Jeff Parsons <parsons@isis-server.isis.vanderbilt.edu> + + * tao/ValueBase.h: + * tao/ValueBase.i: + + Restored const version of ValueBase_var operator that casts to + ValueBase*. + Thu Oct 31 00:46:22 2002 Yamuna Krishnamurthy <yamuna@oomworks.com> * orbsvcs/tests/Notify/Makefile: diff --git a/TAO/tao/ValueBase.h b/TAO/tao/ValueBase.h index 89e2a04c33d..4afdf5e691f 100644 --- a/TAO/tao/ValueBase.h +++ b/TAO/tao/ValueBase.h @@ -116,7 +116,7 @@ public: CORBA_ValueBase_var &operator= (const CORBA_ValueBase_var &); CORBA::ValueBase *operator-> (void) const; - operator const CORBA::ValueBase *&() const; + operator const CORBA::ValueBase *() const; operator CORBA::ValueBase *&(); /// in, inout, out, _retn diff --git a/TAO/tao/ValueBase.i b/TAO/tao/ValueBase.i index fe425ae3292..0fe4a816001 100644 --- a/TAO/tao/ValueBase.i +++ b/TAO/tao/ValueBase.i @@ -82,10 +82,9 @@ CORBA_ValueBase_var::operator= (const CORBA_ValueBase_var &p) } ACE_INLINE -CORBA_ValueBase_var::operator const CORBA::ValueBase *&() const // cast +CORBA_ValueBase_var::operator const CORBA::ValueBase *() const // cast { - return ACE_const_cast (const CORBA::ValueBase *&, - this->ptr_); + return this->ptr_; } ACE_INLINE |