diff options
| -rw-r--r-- | TAO/tao/DynamicAny/DynCommon.cpp | 1 | ||||
| -rw-r--r-- | TAO/tao/DynamicAny/DynUnion_i.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/TAO/tao/DynamicAny/DynCommon.cpp b/TAO/tao/DynamicAny/DynCommon.cpp index 0dab1fd2b13..fd40600de6a 100644 --- a/TAO/tao/DynamicAny/DynCommon.cpp +++ b/TAO/tao/DynamicAny/DynCommon.cpp @@ -1652,7 +1652,6 @@ TAO_DynCommon::set_flag (DynamicAny::DynAny_ptr component, case CORBA::tk_value: case CORBA::tk_value_box: ACE_THROW (CORBA::NO_IMPLEMENT ()); - break; default: { TAO_DynAny_i *tmp = TAO_DynAny_i::_narrow (component, diff --git a/TAO/tao/DynamicAny/DynUnion_i.cpp b/TAO/tao/DynamicAny/DynUnion_i.cpp index 32fee34d969..02042f1ed6b 100644 --- a/TAO/tao/DynamicAny/DynUnion_i.cpp +++ b/TAO/tao/DynamicAny/DynUnion_i.cpp @@ -372,7 +372,7 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value, } // If we got a match, a named member will be active. - this->discriminator_->from_any (*label_any, + this->discriminator_->from_any (label_any.in (), ACE_TRY_ENV); ACE_CHECK; |