diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-04-07 21:55:50 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-04-07 21:55:50 +0000 |
| commit | 1e35cd2b44c1bf3efcd56ca322c23571962bf9fb (patch) | |
| tree | 4e309146f0b8ce0884188c3a2bbc7953a9db9c25 | |
| parent | 56b941e8db57d31f9a52bd2d29b5376f5cde49eb (diff) | |
| download | ATCD-1e35cd2b44c1bf3efcd56ca322c23571962bf9fb.tar.gz | |
ChangeLogTag: Mon Apr 7 16:53:24 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/tao/DynamicAny/DynCommon.cpp | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index df60e158b36..0fa27643d80 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Mon Apr 7 16:53:24 2003 Jeff Parsons <j.parsons@vanderbilt.edu> + + * tao/DynamicAny/DynCommon.cpp (get_any): + + Another stab at making all our compilers happy with + temporary variations in constness. + Mon Apr 07 14:11:02 2003 Pradeep Gore <pradeep@oomworks.com> * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier: diff --git a/TAO/tao/DynamicAny/DynCommon.cpp b/TAO/tao/DynamicAny/DynCommon.cpp index 54de362225d..66ac9a82332 100644 --- a/TAO/tao/DynamicAny/DynCommon.cpp +++ b/TAO/tao/DynamicAny/DynCommon.cpp @@ -1420,14 +1420,14 @@ TAO_DynCommon::get_any (ACE_ENV_SINGLE_ARG_DECL) } else { - CORBA::Any_ptr tmp = 0; + const CORBA::Any *tmp = 0; ACE_NEW_THROW_EX (tmp, CORBA::Any, CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); - CORBA::Any_var val = tmp; + CORBA::Any_var val = ACE_const_cast (CORBA::Any *, tmp); if ((this->any_ >>= tmp) == 0) { |