diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp')
-rw-r--r-- | TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp index efc0446c718..96600c3ac55 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "orbsvcs/IFRService/UnionDef_i.h" -#include "orbsvcs/IFRService/RecursDef_i.h" -#include "orbsvcs/IFRService/Repository_i.h" -#include "orbsvcs/IFRService/IFR_Service_Utils.h" +#include "UnionDef_i.h" +#include "RecursDef_i.h" +#include "Repository_i.h" +#include "IFR_Service_Utils.h" #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" #include "tao/CDR.h" @@ -16,7 +16,6 @@ ACE_RCSID (IFRService, UnionDef_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_UnionDef_i::TAO_UnionDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), @@ -289,9 +288,6 @@ TAO_UnionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL) CORBA::Object_var obj; TAO_IDLType_i *impl = 0; - // Store to replace below. - ACE_Configuration_Section_Key key_holder = this->section_key_; - for (CORBA::ULong k = 0; k < size; ++k) { key_queue.dequeue_head (next_key); @@ -329,11 +325,6 @@ TAO_UnionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL) retval[k].type = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - - // If this union contains a nested union (of another type) at - // some level, the above code will have changed the section key - // so we have to replace it with the value we stored above. - this->section_key (key_holder); } return retval._retn (); @@ -482,5 +473,3 @@ TAO_UnionDef_i::fetch_label (const ACE_Configuration_Section_Key member_key, break; } } - -TAO_END_VERSIONED_NAMESPACE_DECL |