ChangeLogTag: Tue Dec 5 19:39:48 2000 Jeff Parsons <parsons@cs.wustl.edu>

1 files changed, 1423 insertions, 1492 deletions

diff --git a/TAO/tao/diffs/InterfaceC.i.diff b/TAO/tao/diffs/InterfaceC.i.diff
index 4017a4e488f..f9552a4261e 100644
--- a/TAO/tao/diffs/InterfaceC.i.diff
+++ b/TAO/tao/diffs/InterfaceC.i.diff
@@ -1,5 +1,5 @@
---- InterfaceC.i	Fri Dec 01 16:26:16 2000
-+++ ..\..\..\tao\InterfaceC.i	Fri Dec 01 21:34:26 2000
+--- InterfaceC.i	Wed Dec 06 01:22:07 2000
++++ ..\..\..\tao\InterfaceC.i	Wed Dec 06 01:14:55 2000
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -13,8 +13,8 @@
  //     http://www.cs.wustl.edu/~schmidt/TAO.html
  
 -
--#if !defined (_TAO_CORBA_IROBJECT___CI_)
--#define _TAO_CORBA_IROBJECT___CI_
+-#if !defined (_CORBA_IROBJECT___CI_)
+-#define _CORBA_IROBJECT___CI_
 -
  ACE_INLINE
 -CORBA::IRObject::IRObject (
@@ -29,8 +29,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_CORBA_IROBJECT___VAR_CI_)
--#define _TAO_CORBA_IROBJECT___VAR_CI_
+-#if !defined (_CORBA_IROBJECT___VAR_CI_)
+-#define _CORBA_IROBJECT___VAR_CI_
 -
  // *************************************************************
 -// Inline operations for class CORBA::IRObject_var
@@ -157,8 +157,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_CORBA_IROBJECT___OUT_CI_)
--#define _TAO_CORBA_IROBJECT___OUT_CI_
+-#if !defined (_CORBA_IROBJECT___OUT_CI_)
+-#define _CORBA_IROBJECT___OUT_CI_
 -
  // *************************************************************
 -// Inline operations for class CORBA::IRObject_out
@@ -247,8 +247,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_CONTAINED___CI_)
--#define _TAO_IR_CONTAINED___CI_
+-#if !defined (_IR_CONTAINED___CI_)
+-#define _IR_CONTAINED___CI_
 -
  ACE_INLINE
 -IR::Contained::Contained (
@@ -264,8 +264,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_CONTAINED___VAR_CI_)
--#define _TAO_IR_CONTAINED___VAR_CI_
+-#if !defined (_IR_CONTAINED___VAR_CI_)
+-#define _IR_CONTAINED___VAR_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::Contained_var
@@ -392,8 +392,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_CONTAINED___OUT_CI_)
--#define _TAO_IR_CONTAINED___OUT_CI_
+-#if !defined (_IR_CONTAINED___OUT_CI_)
+-#define _IR_CONTAINED___OUT_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::Contained_out
@@ -482,8 +482,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_REPOSITORY___CI_)
--#define _TAO_IR_REPOSITORY___CI_
+-#if !defined (_IR_REPOSITORY___CI_)
+-#define _IR_REPOSITORY___CI_
 -
  ACE_INLINE
 -IR::Repository::Repository (
@@ -499,8 +499,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_REPOSITORY___VAR_CI_)
--#define _TAO_IR_REPOSITORY___VAR_CI_
+-#if !defined (_IR_REPOSITORY___VAR_CI_)
+-#define _IR_REPOSITORY___VAR_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::Repository_var
@@ -627,8 +627,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_REPOSITORY___OUT_CI_)
--#define _TAO_IR_REPOSITORY___OUT_CI_
+-#if !defined (_IR_REPOSITORY___OUT_CI_)
+-#define _IR_REPOSITORY___OUT_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::Repository_out
@@ -717,8 +717,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_CONTAINER___CI_)
--#define _TAO_IR_CONTAINER___CI_
+-#if !defined (_IR_CONTAINER___CI_)
+-#define _IR_CONTAINER___CI_
 -
  ACE_INLINE
 -IR::Container::Container (
@@ -734,8 +734,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_CONTAINER___VAR_CI_)
--#define _TAO_IR_CONTAINER___VAR_CI_
+-#if !defined (_IR_CONTAINER___VAR_CI_)
+-#define _IR_CONTAINER___VAR_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::Container_var
@@ -862,8 +862,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_CONTAINER___OUT_CI_)
--#define _TAO_IR_CONTAINER___OUT_CI_
+-#if !defined (_IR_CONTAINER___OUT_CI_)
+-#define _IR_CONTAINER___OUT_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::Container_out
@@ -1171,8 +1171,8 @@
  }
  
 -
--#if !defined (_TAO_IR_MODULEDEF___CI_)
--#define _TAO_IR_MODULEDEF___CI_
+-#if !defined (_IR_MODULEDEF___CI_)
+-#define _IR_MODULEDEF___CI_
 -
  ACE_INLINE
 -IR::ModuleDef::ModuleDef (
@@ -1188,8 +1188,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_MODULEDEF___VAR_CI_)
--#define _TAO_IR_MODULEDEF___VAR_CI_
+-#if !defined (_IR_MODULEDEF___VAR_CI_)
+-#define _IR_MODULEDEF___VAR_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::ModuleDef_var
@@ -1316,8 +1316,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_MODULEDEF___OUT_CI_)
--#define _TAO_IR_MODULEDEF___OUT_CI_
+-#if !defined (_IR_MODULEDEF___OUT_CI_)
+-#define _IR_MODULEDEF___OUT_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::ModuleDef_out
@@ -1406,8 +1406,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_CONSTANTDEF___CI_)
--#define _TAO_IR_CONSTANTDEF___CI_
+-#if !defined (_IR_CONSTANTDEF___CI_)
+-#define _IR_CONSTANTDEF___CI_
 -
  ACE_INLINE
 -IR::ConstantDef::ConstantDef (
@@ -1423,8 +1423,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_CONSTANTDEF___VAR_CI_)
--#define _TAO_IR_CONSTANTDEF___VAR_CI_
+-#if !defined (_IR_CONSTANTDEF___VAR_CI_)
+-#define _IR_CONSTANTDEF___VAR_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::ConstantDef_var
@@ -1551,8 +1551,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_CONSTANTDEF___OUT_CI_)
--#define _TAO_IR_CONSTANTDEF___OUT_CI_
+-#if !defined (_IR_CONSTANTDEF___OUT_CI_)
+-#define _IR_CONSTANTDEF___OUT_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::ConstantDef_out
@@ -1641,8 +1641,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_IDLTYPE___CI_)
--#define _TAO_IR_IDLTYPE___CI_
+-#if !defined (_IR_IDLTYPE___CI_)
+-#define _IR_IDLTYPE___CI_
 -
  ACE_INLINE
 -IR::IDLType::IDLType (
@@ -1658,8 +1658,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_IDLTYPE___VAR_CI_)
--#define _TAO_IR_IDLTYPE___VAR_CI_
+-#if !defined (_IR_IDLTYPE___VAR_CI_)
+-#define _IR_IDLTYPE___VAR_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::IDLType_var
@@ -1786,8 +1786,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_IDLTYPE___OUT_CI_)
--#define _TAO_IR_IDLTYPE___OUT_CI_
+-#if !defined (_IR_IDLTYPE___OUT_CI_)
+-#define _IR_IDLTYPE___OUT_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::IDLType_out
@@ -1876,8 +1876,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_STRUCTDEF___CI_)
--#define _TAO_IR_STRUCTDEF___CI_
+-#if !defined (_IR_STRUCTDEF___CI_)
+-#define _IR_STRUCTDEF___CI_
 -
  ACE_INLINE
 -IR::StructDef::StructDef (
@@ -1893,8 +1893,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_STRUCTDEF___VAR_CI_)
--#define _TAO_IR_STRUCTDEF___VAR_CI_
+-#if !defined (_IR_STRUCTDEF___VAR_CI_)
+-#define _IR_STRUCTDEF___VAR_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::StructDef_var
@@ -2021,8 +2021,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_STRUCTDEF___OUT_CI_)
--#define _TAO_IR_STRUCTDEF___OUT_CI_
+-#if !defined (_IR_STRUCTDEF___OUT_CI_)
+-#define _IR_STRUCTDEF___OUT_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::StructDef_out
@@ -2111,8 +2111,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_UNIONDEF___CI_)
--#define _TAO_IR_UNIONDEF___CI_
+-#if !defined (_IR_UNIONDEF___CI_)
+-#define _IR_UNIONDEF___CI_
 -
  ACE_INLINE
 -IR::UnionDef::UnionDef (
@@ -2128,8 +2128,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_UNIONDEF___VAR_CI_)
--#define _TAO_IR_UNIONDEF___VAR_CI_
+-#if !defined (_IR_UNIONDEF___VAR_CI_)
+-#define _IR_UNIONDEF___VAR_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::UnionDef_var
@@ -2256,8 +2256,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_UNIONDEF___OUT_CI_)
--#define _TAO_IR_UNIONDEF___OUT_CI_
+-#if !defined (_IR_UNIONDEF___OUT_CI_)
+-#define _IR_UNIONDEF___OUT_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::UnionDef_out
@@ -2346,8 +2346,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_ENUMDEF___CI_)
--#define _TAO_IR_ENUMDEF___CI_
+-#if !defined (_IR_ENUMDEF___CI_)
+-#define _IR_ENUMDEF___CI_
 -
  ACE_INLINE
 -IR::EnumDef::EnumDef (
@@ -2363,8 +2363,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_ENUMDEF___VAR_CI_)
--#define _TAO_IR_ENUMDEF___VAR_CI_
+-#if !defined (_IR_ENUMDEF___VAR_CI_)
+-#define _IR_ENUMDEF___VAR_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::EnumDef_var
@@ -2491,8 +2491,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_ENUMDEF___OUT_CI_)
--#define _TAO_IR_ENUMDEF___OUT_CI_
+-#if !defined (_IR_ENUMDEF___OUT_CI_)
+-#define _IR_ENUMDEF___OUT_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::EnumDef_out
@@ -2581,8 +2581,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_ALIASDEF___CI_)
--#define _TAO_IR_ALIASDEF___CI_
+-#if !defined (_IR_ALIASDEF___CI_)
+-#define _IR_ALIASDEF___CI_
 -
  ACE_INLINE
 -IR::AliasDef::AliasDef (
@@ -2598,8 +2598,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_ALIASDEF___VAR_CI_)
--#define _TAO_IR_ALIASDEF___VAR_CI_
+-#if !defined (_IR_ALIASDEF___VAR_CI_)
+-#define _IR_ALIASDEF___VAR_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::AliasDef_var
@@ -2726,8 +2726,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_ALIASDEF___OUT_CI_)
--#define _TAO_IR_ALIASDEF___OUT_CI_
+-#if !defined (_IR_ALIASDEF___OUT_CI_)
+-#define _IR_ALIASDEF___OUT_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::AliasDef_out
@@ -2816,8 +2816,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_INTERFACEDEF___CI_)
--#define _TAO_IR_INTERFACEDEF___CI_
+-#if !defined (_IR_INTERFACEDEF___CI_)
+-#define _IR_INTERFACEDEF___CI_
 -
  ACE_INLINE
 -IR::InterfaceDef::InterfaceDef (
@@ -2833,8 +2833,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_INTERFACEDEF___VAR_CI_)
--#define _TAO_IR_INTERFACEDEF___VAR_CI_
+-#if !defined (_IR_INTERFACEDEF___VAR_CI_)
+-#define _IR_INTERFACEDEF___VAR_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::InterfaceDef_var
@@ -2961,8 +2961,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_INTERFACEDEF___OUT_CI_)
--#define _TAO_IR_INTERFACEDEF___OUT_CI_
+-#if !defined (_IR_INTERFACEDEF___OUT_CI_)
+-#define _IR_INTERFACEDEF___OUT_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::InterfaceDef_out
@@ -3051,8 +3051,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_EXCEPTIONDEF___CI_)
--#define _TAO_IR_EXCEPTIONDEF___CI_
+-#if !defined (_IR_EXCEPTIONDEF___CI_)
+-#define _IR_EXCEPTIONDEF___CI_
 -
  ACE_INLINE
 -IR::ExceptionDef::ExceptionDef (
@@ -3068,8 +3068,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_EXCEPTIONDEF___VAR_CI_)
--#define _TAO_IR_EXCEPTIONDEF___VAR_CI_
+-#if !defined (_IR_EXCEPTIONDEF___VAR_CI_)
+-#define _IR_EXCEPTIONDEF___VAR_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::ExceptionDef_var
@@ -3196,8 +3196,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_EXCEPTIONDEF___OUT_CI_)
--#define _TAO_IR_EXCEPTIONDEF___OUT_CI_
+-#if !defined (_IR_EXCEPTIONDEF___OUT_CI_)
+-#define _IR_EXCEPTIONDEF___OUT_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::ExceptionDef_out
@@ -3286,8 +3286,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_NATIVEDEF___CI_)
--#define _TAO_IR_NATIVEDEF___CI_
+-#if !defined (_IR_NATIVEDEF___CI_)
+-#define _IR_NATIVEDEF___CI_
 -
  ACE_INLINE
 -IR::NativeDef::NativeDef (
@@ -3303,8 +3303,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_NATIVEDEF___VAR_CI_)
--#define _TAO_IR_NATIVEDEF___VAR_CI_
+-#if !defined (_IR_NATIVEDEF___VAR_CI_)
+-#define _IR_NATIVEDEF___VAR_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::NativeDef_var
@@ -3431,8 +3431,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_NATIVEDEF___OUT_CI_)
--#define _TAO_IR_NATIVEDEF___OUT_CI_
+-#if !defined (_IR_NATIVEDEF___OUT_CI_)
+-#define _IR_NATIVEDEF___OUT_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::NativeDef_out
@@ -3523,8 +3523,8 @@
 -
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
    
--#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_INTERFACEDEFSEQ_CI_)
--#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_INTERFACEDEFSEQ_CI_
+-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_INTERFACEDEFSEQ_CI_)
+-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_INTERFACEDEFSEQ_CI_
 -
 -  ACE_INLINE IR::InterfaceDef **
 -  IR::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::allocbuf (CORBA::ULong nelems)
@@ -3696,8 +3696,8 @@
 -
  #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  
--#if !defined (_TAO_IR_INTERFACEDEFSEQ_CI_)
--#define _TAO_IR_INTERFACEDEFSEQ_CI_
+-#if !defined (_IR_INTERFACEDEFSEQ_CI_)
+-#define _IR_INTERFACEDEFSEQ_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::InterfaceDefSeq_var
@@ -3940,8 +3940,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_VALUEDEF___CI_)
--#define _TAO_IR_VALUEDEF___CI_
+-#if !defined (_IR_VALUEDEF___CI_)
+-#define _IR_VALUEDEF___CI_
 -
  ACE_INLINE
 -IR::ValueDef::ValueDef (
@@ -3957,8 +3957,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_VALUEDEF___VAR_CI_)
--#define _TAO_IR_VALUEDEF___VAR_CI_
+-#if !defined (_IR_VALUEDEF___VAR_CI_)
+-#define _IR_VALUEDEF___VAR_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::ValueDef_var
@@ -4085,8 +4085,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_VALUEDEF___OUT_CI_)
--#define _TAO_IR_VALUEDEF___OUT_CI_
+-#if !defined (_IR_VALUEDEF___OUT_CI_)
+-#define _IR_VALUEDEF___OUT_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::ValueDef_out
@@ -4177,8 +4177,8 @@
 -
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
    
--#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_VALUEDEFSEQ_CI_)
--#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_VALUEDEFSEQ_CI_
+-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_VALUEDEFSEQ_CI_)
+-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_VALUEDEFSEQ_CI_
 -
 -  ACE_INLINE IR::ValueDef **
 -  IR::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::allocbuf (CORBA::ULong nelems)
@@ -4350,8 +4350,8 @@
 -
  #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  
--#if !defined (_TAO_IR_VALUEDEFSEQ_CI_)
--#define _TAO_IR_VALUEDEFSEQ_CI_
+-#if !defined (_IR_VALUEDEFSEQ_CI_)
+-#define _IR_VALUEDEFSEQ_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::ValueDefSeq_var
@@ -4594,8 +4594,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_VALUEBOXDEF___CI_)
--#define _TAO_IR_VALUEBOXDEF___CI_
+-#if !defined (_IR_VALUEBOXDEF___CI_)
+-#define _IR_VALUEBOXDEF___CI_
 -
  ACE_INLINE
 -IR::ValueBoxDef::ValueBoxDef (
@@ -4611,8 +4611,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_VALUEBOXDEF___VAR_CI_)
--#define _TAO_IR_VALUEBOXDEF___VAR_CI_
+-#if !defined (_IR_VALUEBOXDEF___VAR_CI_)
+-#define _IR_VALUEBOXDEF___VAR_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::ValueBoxDef_var
@@ -4739,8 +4739,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_VALUEBOXDEF___OUT_CI_)
--#define _TAO_IR_VALUEBOXDEF___OUT_CI_
+-#if !defined (_IR_VALUEBOXDEF___OUT_CI_)
+-#define _IR_VALUEBOXDEF___OUT_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::ValueBoxDef_out
@@ -4829,8 +4829,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_COMPONENTDEF___CI_)
--#define _TAO_IR_COMPONENTDEF___CI_
+-#if !defined (_IR_COMPONENTDEF___CI_)
+-#define _IR_COMPONENTDEF___CI_
 -
  ACE_INLINE
 -IR::ComponentDef::ComponentDef (
@@ -4846,8 +4846,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_COMPONENTDEF___VAR_CI_)
--#define _TAO_IR_COMPONENTDEF___VAR_CI_
+-#if !defined (_IR_COMPONENTDEF___VAR_CI_)
+-#define _IR_COMPONENTDEF___VAR_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::ComponentDef_var
@@ -4974,8 +4974,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_COMPONENTDEF___OUT_CI_)
--#define _TAO_IR_COMPONENTDEF___OUT_CI_
+-#if !defined (_IR_COMPONENTDEF___OUT_CI_)
+-#define _IR_COMPONENTDEF___OUT_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::ComponentDef_out
@@ -5066,8 +5066,8 @@
 -
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
    
--#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_COMPONENTDEFSEQ_CI_)
--#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_COMPONENTDEFSEQ_CI_
+-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_COMPONENTDEFSEQ_CI_)
+-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_COMPONENTDEFSEQ_CI_
 -
 -  ACE_INLINE IR::ComponentDef **
 -  IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (CORBA::ULong nelems)
@@ -5239,8 +5239,8 @@
 -
  #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  
--#if !defined (_TAO_IR_COMPONENTDEFSEQ_CI_)
--#define _TAO_IR_COMPONENTDEFSEQ_CI_
+-#if !defined (_IR_COMPONENTDEFSEQ_CI_)
+-#define _IR_COMPONENTDEFSEQ_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::ComponentDefSeq_var
@@ -5483,8 +5483,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_PROVIDESDEF___CI_)
--#define _TAO_IR_PROVIDESDEF___CI_
+-#if !defined (_IR_PROVIDESDEF___CI_)
+-#define _IR_PROVIDESDEF___CI_
 -
  ACE_INLINE
 -IR::ProvidesDef::ProvidesDef (
@@ -5500,8 +5500,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_PROVIDESDEF___VAR_CI_)
--#define _TAO_IR_PROVIDESDEF___VAR_CI_
+-#if !defined (_IR_PROVIDESDEF___VAR_CI_)
+-#define _IR_PROVIDESDEF___VAR_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::ProvidesDef_var
@@ -5628,8 +5628,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_PROVIDESDEF___OUT_CI_)
--#define _TAO_IR_PROVIDESDEF___OUT_CI_
+-#if !defined (_IR_PROVIDESDEF___OUT_CI_)
+-#define _IR_PROVIDESDEF___OUT_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::ProvidesDef_out
@@ -5720,8 +5720,8 @@
 -
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
    
--#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PROVIDESDEFSEQ_CI_)
--#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PROVIDESDEFSEQ_CI_
+-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PROVIDESDEFSEQ_CI_)
+-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PROVIDESDEFSEQ_CI_
 -
 -  ACE_INLINE IR::ProvidesDef **
 -  IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (CORBA::ULong nelems)
@@ -5893,8 +5893,8 @@
 -
  #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  
--#if !defined (_TAO_IR_PROVIDESDEFSEQ_CI_)
--#define _TAO_IR_PROVIDESDEFSEQ_CI_
+-#if !defined (_IR_PROVIDESDEFSEQ_CI_)
+-#define _IR_PROVIDESDEFSEQ_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::ProvidesDefSeq_var
@@ -6137,8 +6137,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_USESDEF___CI_)
--#define _TAO_IR_USESDEF___CI_
+-#if !defined (_IR_USESDEF___CI_)
+-#define _IR_USESDEF___CI_
 -
  ACE_INLINE
 -IR::UsesDef::UsesDef (
@@ -6154,8 +6154,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_USESDEF___VAR_CI_)
--#define _TAO_IR_USESDEF___VAR_CI_
+-#if !defined (_IR_USESDEF___VAR_CI_)
+-#define _IR_USESDEF___VAR_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::UsesDef_var
@@ -6282,13 +6282,15 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_USESDEF___OUT_CI_)
--#define _TAO_IR_USESDEF___OUT_CI_
+-#if !defined (_IR_USESDEF___OUT_CI_)
+-#define _IR_USESDEF___OUT_CI_
 -
- // *************************************************************
+-// *************************************************************
 -// Inline operations for class IR::UsesDef_out
+-// *************************************************************
++// *************************************************************
 +// Inline operations for class IR_UsesDef_out
- // *************************************************************
++// *************************************************************
  
  ACE_INLINE
 -IR::UsesDef_out::UsesDef_out (IR::UsesDef_ptr &p)
@@ -6374,8 +6376,8 @@
 -
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
    
--#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_USESDEFSEQ_CI_)
--#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_USESDEFSEQ_CI_
+-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_USESDEFSEQ_CI_)
+-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_USESDEFSEQ_CI_
 -
 -  ACE_INLINE IR::UsesDef **
 -  IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (CORBA::ULong nelems)
@@ -6547,8 +6549,8 @@
 -
  #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  
--#if !defined (_TAO_IR_USESDEFSEQ_CI_)
--#define _TAO_IR_USESDEFSEQ_CI_
+-#if !defined (_IR_USESDEFSEQ_CI_)
+-#define _IR_USESDEFSEQ_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::UsesDefSeq_var
@@ -6791,8 +6793,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_HOMEDEF___CI_)
--#define _TAO_IR_HOMEDEF___CI_
+-#if !defined (_IR_HOMEDEF___CI_)
+-#define _IR_HOMEDEF___CI_
 -
  ACE_INLINE
 -IR::HomeDef::HomeDef (
@@ -6808,8 +6810,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_HOMEDEF___VAR_CI_)
--#define _TAO_IR_HOMEDEF___VAR_CI_
+-#if !defined (_IR_HOMEDEF___VAR_CI_)
+-#define _IR_HOMEDEF___VAR_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::HomeDef_var
@@ -6936,8 +6938,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_HOMEDEF___OUT_CI_)
--#define _TAO_IR_HOMEDEF___OUT_CI_
+-#if !defined (_IR_HOMEDEF___OUT_CI_)
+-#define _IR_HOMEDEF___OUT_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::HomeDef_out
@@ -7028,8 +7030,8 @@
 -
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
    
--#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_HOMEDEFSEQ_CI_)
--#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_HOMEDEFSEQ_CI_
+-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_HOMEDEFSEQ_CI_)
+-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_HOMEDEFSEQ_CI_
 -
 -  ACE_INLINE IR::HomeDef **
 -  IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (CORBA::ULong nelems)
@@ -7201,8 +7203,8 @@
 -
  #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  
--#if !defined (_TAO_IR_HOMEDEFSEQ_CI_)
--#define _TAO_IR_HOMEDEFSEQ_CI_
+-#if !defined (_IR_HOMEDEFSEQ_CI_)
+-#define _IR_HOMEDEFSEQ_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::HomeDefSeq_var
@@ -7445,8 +7447,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_EVENTDEF___CI_)
--#define _TAO_IR_EVENTDEF___CI_
+-#if !defined (_IR_EVENTDEF___CI_)
+-#define _IR_EVENTDEF___CI_
 -
  ACE_INLINE
 -IR::EventDef::EventDef (
@@ -7462,8 +7464,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_EVENTDEF___VAR_CI_)
--#define _TAO_IR_EVENTDEF___VAR_CI_
+-#if !defined (_IR_EVENTDEF___VAR_CI_)
+-#define _IR_EVENTDEF___VAR_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::EventDef_var
@@ -7590,8 +7592,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_EVENTDEF___OUT_CI_)
--#define _TAO_IR_EVENTDEF___OUT_CI_
+-#if !defined (_IR_EVENTDEF___OUT_CI_)
+-#define _IR_EVENTDEF___OUT_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::EventDef_out
@@ -7680,8 +7682,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_EMITSDEF___CI_)
--#define _TAO_IR_EMITSDEF___CI_
+-#if !defined (_IR_EMITSDEF___CI_)
+-#define _IR_EMITSDEF___CI_
 -
  ACE_INLINE
 -IR::EmitsDef::EmitsDef (
@@ -7697,8 +7699,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_EMITSDEF___VAR_CI_)
--#define _TAO_IR_EMITSDEF___VAR_CI_
+-#if !defined (_IR_EMITSDEF___VAR_CI_)
+-#define _IR_EMITSDEF___VAR_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::EmitsDef_var
@@ -7825,8 +7827,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_EMITSDEF___OUT_CI_)
--#define _TAO_IR_EMITSDEF___OUT_CI_
+-#if !defined (_IR_EMITSDEF___OUT_CI_)
+-#define _IR_EMITSDEF___OUT_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::EmitsDef_out
@@ -7917,8 +7919,8 @@
 -
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
    
--#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EMITSDEFSEQ_CI_)
--#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EMITSDEFSEQ_CI_
+-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EMITSDEFSEQ_CI_)
+-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EMITSDEFSEQ_CI_
 -
 -  ACE_INLINE IR::EmitsDef **
 -  IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (CORBA::ULong nelems)
@@ -8090,8 +8092,8 @@
 -
  #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  
--#if !defined (_TAO_IR_EMITSDEFSEQ_CI_)
--#define _TAO_IR_EMITSDEFSEQ_CI_
+-#if !defined (_IR_EMITSDEFSEQ_CI_)
+-#define _IR_EMITSDEFSEQ_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::EmitsDefSeq_var
@@ -8334,8 +8336,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_PUBLISHESDEF___CI_)
--#define _TAO_IR_PUBLISHESDEF___CI_
+-#if !defined (_IR_PUBLISHESDEF___CI_)
+-#define _IR_PUBLISHESDEF___CI_
 -
  ACE_INLINE
 -IR::PublishesDef::PublishesDef (
@@ -8351,8 +8353,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_PUBLISHESDEF___VAR_CI_)
--#define _TAO_IR_PUBLISHESDEF___VAR_CI_
+-#if !defined (_IR_PUBLISHESDEF___VAR_CI_)
+-#define _IR_PUBLISHESDEF___VAR_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::PublishesDef_var
@@ -8479,8 +8481,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_PUBLISHESDEF___OUT_CI_)
--#define _TAO_IR_PUBLISHESDEF___OUT_CI_
+-#if !defined (_IR_PUBLISHESDEF___OUT_CI_)
+-#define _IR_PUBLISHESDEF___OUT_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::PublishesDef_out
@@ -8571,8 +8573,8 @@
 -
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
    
--#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PUBLISHESDEFSEQ_CI_)
--#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PUBLISHESDEFSEQ_CI_
+-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PUBLISHESDEFSEQ_CI_)
+-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PUBLISHESDEFSEQ_CI_
 -
 -  ACE_INLINE IR::PublishesDef **
 -  IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (CORBA::ULong nelems)
@@ -8744,8 +8746,8 @@
 -
  #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  
--#if !defined (_TAO_IR_PUBLISHESDEFSEQ_CI_)
--#define _TAO_IR_PUBLISHESDEFSEQ_CI_
+-#if !defined (_IR_PUBLISHESDEFSEQ_CI_)
+-#define _IR_PUBLISHESDEFSEQ_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::PublishesDefSeq_var
@@ -8988,8 +8990,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_CONSUMESDEF___CI_)
--#define _TAO_IR_CONSUMESDEF___CI_
+-#if !defined (_IR_CONSUMESDEF___CI_)
+-#define _IR_CONSUMESDEF___CI_
 -
  ACE_INLINE
 -IR::ConsumesDef::ConsumesDef (
@@ -9005,8 +9007,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_CONSUMESDEF___VAR_CI_)
--#define _TAO_IR_CONSUMESDEF___VAR_CI_
+-#if !defined (_IR_CONSUMESDEF___VAR_CI_)
+-#define _IR_CONSUMESDEF___VAR_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::ConsumesDef_var
@@ -9133,8 +9135,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_CONSUMESDEF___OUT_CI_)
--#define _TAO_IR_CONSUMESDEF___OUT_CI_
+-#if !defined (_IR_CONSUMESDEF___OUT_CI_)
+-#define _IR_CONSUMESDEF___OUT_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::ConsumesDef_out
@@ -9225,8 +9227,8 @@
 -
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
    
--#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONSUMESDEFSEQ_CI_)
--#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONSUMESDEFSEQ_CI_
+-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONSUMESDEFSEQ_CI_)
+-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONSUMESDEFSEQ_CI_
 -
 -  ACE_INLINE IR::ConsumesDef **
 -  IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (CORBA::ULong nelems)
@@ -9398,8 +9400,8 @@
 -
  #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  
--#if !defined (_TAO_IR_CONSUMESDEFSEQ_CI_)
--#define _TAO_IR_CONSUMESDEFSEQ_CI_
+-#if !defined (_IR_CONSUMESDEFSEQ_CI_)
+-#define _IR_CONSUMESDEFSEQ_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::ConsumesDefSeq_var
@@ -9642,8 +9644,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_FACTORYDEF___CI_)
--#define _TAO_IR_FACTORYDEF___CI_
+-#if !defined (_IR_FACTORYDEF___CI_)
+-#define _IR_FACTORYDEF___CI_
 -
  ACE_INLINE
 -IR::FactoryDef::FactoryDef (
@@ -9659,8 +9661,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_FACTORYDEF___VAR_CI_)
--#define _TAO_IR_FACTORYDEF___VAR_CI_
+-#if !defined (_IR_FACTORYDEF___VAR_CI_)
+-#define _IR_FACTORYDEF___VAR_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::FactoryDef_var
@@ -9787,8 +9789,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_FACTORYDEF___OUT_CI_)
--#define _TAO_IR_FACTORYDEF___OUT_CI_
+-#if !defined (_IR_FACTORYDEF___OUT_CI_)
+-#define _IR_FACTORYDEF___OUT_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::FactoryDef_out
@@ -9879,8 +9881,8 @@
 -
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
    
--#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FACTORYDEFSEQ_CI_)
--#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FACTORYDEFSEQ_CI_
+-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FACTORYDEFSEQ_CI_)
+-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FACTORYDEFSEQ_CI_
 -
 -  ACE_INLINE IR::FactoryDef **
 -  IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (CORBA::ULong nelems)
@@ -10052,8 +10054,8 @@
 -
  #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  
--#if !defined (_TAO_IR_FACTORYDEFSEQ_CI_)
--#define _TAO_IR_FACTORYDEFSEQ_CI_
+-#if !defined (_IR_FACTORYDEFSEQ_CI_)
+-#define _IR_FACTORYDEFSEQ_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::FactoryDefSeq_var
@@ -10296,8 +10298,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_FINDERDEF___CI_)
--#define _TAO_IR_FINDERDEF___CI_
+-#if !defined (_IR_FINDERDEF___CI_)
+-#define _IR_FINDERDEF___CI_
 -
  ACE_INLINE
 -IR::FinderDef::FinderDef (
@@ -10313,8 +10315,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_FINDERDEF___VAR_CI_)
--#define _TAO_IR_FINDERDEF___VAR_CI_
+-#if !defined (_IR_FINDERDEF___VAR_CI_)
+-#define _IR_FINDERDEF___VAR_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::FinderDef_var
@@ -10429,24 +10431,21 @@
 +ACE_INLINE IR_FinderDef_ptr 
 +IR_FinderDef_var::_retn (void)
  {
--  // yield ownership of managed obj reference
+   // yield ownership of managed obj reference
 -  IR::FinderDef_ptr val = this->ptr_;
 -  this->ptr_ = IR::FinderDef::_nil ();
--  return val;
--}
--
++  IR_FinderDef_ptr val = this->ptr_;
++  this->ptr_ = IR_FinderDef::_nil ();
+   return val;
+ }
+ 
 -
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_FINDERDEF___OUT_CI_)
--#define _TAO_IR_FINDERDEF___OUT_CI_
-+  // yield ownership of managed obj reference
-+  IR_FinderDef_ptr val = this->ptr_;
-+  this->ptr_ = IR_FinderDef::_nil ();
-+  return val;
-+}
- 
+-#if !defined (_IR_FINDERDEF___OUT_CI_)
+-#define _IR_FINDERDEF___OUT_CI_
+-
  // *************************************************************
 -// Inline operations for class IR::FinderDef_out
 +// Inline operations for class IR_FinderDef_out
@@ -10536,8 +10535,8 @@
 -
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
    
--#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FINDERDEFSEQ_CI_)
--#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FINDERDEFSEQ_CI_
+-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FINDERDEFSEQ_CI_)
+-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FINDERDEFSEQ_CI_
 -
 -  ACE_INLINE IR::FinderDef **
 -  IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (CORBA::ULong nelems)
@@ -10709,8 +10708,8 @@
 -
  #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  
--#if !defined (_TAO_IR_FINDERDEFSEQ_CI_)
--#define _TAO_IR_FINDERDEFSEQ_CI_
+-#if !defined (_IR_FINDERDEFSEQ_CI_)
+-#define _IR_FINDERDEFSEQ_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::FinderDefSeq_var
@@ -10953,8 +10952,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_PRIMARYKEYDEF___CI_)
--#define _TAO_IR_PRIMARYKEYDEF___CI_
+-#if !defined (_IR_PRIMARYKEYDEF___CI_)
+-#define _IR_PRIMARYKEYDEF___CI_
 -
  ACE_INLINE
 -IR::PrimaryKeyDef::PrimaryKeyDef (
@@ -10970,8 +10969,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_PRIMARYKEYDEF___VAR_CI_)
--#define _TAO_IR_PRIMARYKEYDEF___VAR_CI_
+-#if !defined (_IR_PRIMARYKEYDEF___VAR_CI_)
+-#define _IR_PRIMARYKEYDEF___VAR_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::PrimaryKeyDef_var
@@ -11098,8 +11097,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_PRIMARYKEYDEF___OUT_CI_)
--#define _TAO_IR_PRIMARYKEYDEF___OUT_CI_
+-#if !defined (_IR_PRIMARYKEYDEF___OUT_CI_)
+-#define _IR_PRIMARYKEYDEF___OUT_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::PrimaryKeyDef_out
@@ -11190,8 +11189,8 @@
 -
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
    
--#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONTAINEDSEQ_CI_)
--#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONTAINEDSEQ_CI_
+-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONTAINEDSEQ_CI_)
+-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONTAINEDSEQ_CI_
 -
 -  ACE_INLINE IR::Contained **
 -  IR::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq::allocbuf (CORBA::ULong nelems)
@@ -11363,8 +11362,8 @@
 -
  #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  
--#if !defined (_TAO_IR_CONTAINEDSEQ_CI_)
--#define _TAO_IR_CONTAINEDSEQ_CI_
+-#if !defined (_IR_CONTAINEDSEQ_CI_)
+-#define _IR_CONTAINEDSEQ_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::ContainedSeq_var
@@ -11830,8 +11829,8 @@
  
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
    
--#if !defined (_TAO__TAO_UNBOUNDED_SEQUENCE_IR_STRUCTMEMBERSEQ_CI_)
--#define _TAO__TAO_UNBOUNDED_SEQUENCE_IR_STRUCTMEMBERSEQ_CI_
+-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_STRUCTMEMBERSEQ_CI_)
+-#define __TAO_UNBOUNDED_SEQUENCE_IR_STRUCTMEMBERSEQ_CI_
 -
    // = Static operations.
 -  ACE_INLINE IR::StructMember *
@@ -12020,8 +12019,8 @@
 -
  #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  
--#if !defined (_TAO_IR_STRUCTMEMBERSEQ_CI_)
--#define _TAO_IR_STRUCTMEMBERSEQ_CI_
+-#if !defined (_IR_STRUCTMEMBERSEQ_CI_)
+-#define _IR_STRUCTMEMBERSEQ_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::StructMemberSeq_var
@@ -12496,8 +12495,8 @@
 -
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
    
--#if !defined (_TAO__TAO_UNBOUNDED_SEQUENCE_IR_INITIALIZERSEQ_CI_)
--#define _TAO__TAO_UNBOUNDED_SEQUENCE_IR_INITIALIZERSEQ_CI_
+-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_INITIALIZERSEQ_CI_)
+-#define __TAO_UNBOUNDED_SEQUENCE_IR_INITIALIZERSEQ_CI_
 -
    // = Static operations.
 -  ACE_INLINE IR::Initializer *
@@ -12686,8 +12685,8 @@
 -
  #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  
--#if !defined (_TAO_IR_INITIALIZERSEQ_CI_)
--#define _TAO_IR_INITIALIZERSEQ_CI_
+-#if !defined (_IR_INITIALIZERSEQ_CI_)
+-#define _IR_INITIALIZERSEQ_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::InitializerSeq_var
@@ -13162,8 +13161,8 @@
 -
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
    
--#if !defined (_TAO__TAO_UNBOUNDED_SEQUENCE_IR_UNIONMEMBERSEQ_CI_)
--#define _TAO__TAO_UNBOUNDED_SEQUENCE_IR_UNIONMEMBERSEQ_CI_
+-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_UNIONMEMBERSEQ_CI_)
+-#define __TAO_UNBOUNDED_SEQUENCE_IR_UNIONMEMBERSEQ_CI_
 -
    // = Static operations.
 -  ACE_INLINE IR::UnionMember *
@@ -13352,8 +13351,8 @@
 -
  #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  
--#if !defined (_TAO_IR_UNIONMEMBERSEQ_CI_)
--#define _TAO_IR_UNIONMEMBERSEQ_CI_
+-#if !defined (_IR_UNIONMEMBERSEQ_CI_)
+-#define _IR_UNIONMEMBERSEQ_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::UnionMemberSeq_var
@@ -13605,8 +13604,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_ENUMMEMBERSEQ_CI_)
--#define _TAO_IR_ENUMMEMBERSEQ_CI_
+-#if !defined (_IR_ENUMMEMBERSEQ_CI_)
+-#define _IR_ENUMMEMBERSEQ_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::EnumMemberSeq_var
@@ -14068,8 +14067,8 @@
 -
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
    
--#if !defined (_TAO__TAO_UNBOUNDED_SEQUENCE_IR_CONTAINER_DESCRIPTIONSEQ_CI_)
--#define _TAO__TAO_UNBOUNDED_SEQUENCE_IR_CONTAINER_DESCRIPTIONSEQ_CI_
+-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_CONTAINER_DESCRIPTIONSEQ_CI_)
+-#define __TAO_UNBOUNDED_SEQUENCE_IR_CONTAINER_DESCRIPTIONSEQ_CI_
 -
    // = Static operations.
 -  ACE_INLINE IR::Container::Description *
@@ -14258,8 +14257,8 @@
 -
  #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  
--#if !defined (_TAO_IR_CONTAINER_DESCRIPTIONSEQ_CI_)
--#define _TAO_IR_CONTAINER_DESCRIPTIONSEQ_CI_
+-#if !defined (_IR_CONTAINER_DESCRIPTIONSEQ_CI_)
+-#define _IR_CONTAINER_DESCRIPTIONSEQ_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::Container::DescriptionSeq_var
@@ -14509,8 +14508,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_PRIMITIVEDEF___CI_)
--#define _TAO_IR_PRIMITIVEDEF___CI_
+-#if !defined (_IR_PRIMITIVEDEF___CI_)
+-#define _IR_PRIMITIVEDEF___CI_
 -
  ACE_INLINE
 -IR::PrimitiveDef::PrimitiveDef (
@@ -14526,8 +14525,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_PRIMITIVEDEF___VAR_CI_)
--#define _TAO_IR_PRIMITIVEDEF___VAR_CI_
+-#if !defined (_IR_PRIMITIVEDEF___VAR_CI_)
+-#define _IR_PRIMITIVEDEF___VAR_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::PrimitiveDef_var
@@ -14654,8 +14653,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_PRIMITIVEDEF___OUT_CI_)
--#define _TAO_IR_PRIMITIVEDEF___OUT_CI_
+-#if !defined (_IR_PRIMITIVEDEF___OUT_CI_)
+-#define _IR_PRIMITIVEDEF___OUT_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::PrimitiveDef_out
@@ -14744,8 +14743,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_STRINGDEF___CI_)
--#define _TAO_IR_STRINGDEF___CI_
+-#if !defined (_IR_STRINGDEF___CI_)
+-#define _IR_STRINGDEF___CI_
 -
  ACE_INLINE
 -IR::StringDef::StringDef (
@@ -14761,8 +14760,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_STRINGDEF___VAR_CI_)
--#define _TAO_IR_STRINGDEF___VAR_CI_
+-#if !defined (_IR_STRINGDEF___VAR_CI_)
+-#define _IR_STRINGDEF___VAR_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::StringDef_var
@@ -14889,8 +14888,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_STRINGDEF___OUT_CI_)
--#define _TAO_IR_STRINGDEF___OUT_CI_
+-#if !defined (_IR_STRINGDEF___OUT_CI_)
+-#define _IR_STRINGDEF___OUT_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::StringDef_out
@@ -14979,8 +14978,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_SEQUENCEDEF___CI_)
--#define _TAO_IR_SEQUENCEDEF___CI_
+-#if !defined (_IR_SEQUENCEDEF___CI_)
+-#define _IR_SEQUENCEDEF___CI_
 -
  ACE_INLINE
 -IR::SequenceDef::SequenceDef (
@@ -14996,8 +14995,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_SEQUENCEDEF___VAR_CI_)
--#define _TAO_IR_SEQUENCEDEF___VAR_CI_
+-#if !defined (_IR_SEQUENCEDEF___VAR_CI_)
+-#define _IR_SEQUENCEDEF___VAR_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::SequenceDef_var
@@ -15124,8 +15123,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_SEQUENCEDEF___OUT_CI_)
--#define _TAO_IR_SEQUENCEDEF___OUT_CI_
+-#if !defined (_IR_SEQUENCEDEF___OUT_CI_)
+-#define _IR_SEQUENCEDEF___OUT_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::SequenceDef_out
@@ -15214,8 +15213,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_ARRAYDEF___CI_)
--#define _TAO_IR_ARRAYDEF___CI_
+-#if !defined (_IR_ARRAYDEF___CI_)
+-#define _IR_ARRAYDEF___CI_
 -
  ACE_INLINE
 -IR::ArrayDef::ArrayDef (
@@ -15231,8 +15230,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_ARRAYDEF___VAR_CI_)
--#define _TAO_IR_ARRAYDEF___VAR_CI_
+-#if !defined (_IR_ARRAYDEF___VAR_CI_)
+-#define _IR_ARRAYDEF___VAR_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::ArrayDef_var
@@ -15359,8 +15358,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_ARRAYDEF___OUT_CI_)
--#define _TAO_IR_ARRAYDEF___OUT_CI_
+-#if !defined (_IR_ARRAYDEF___OUT_CI_)
+-#define _IR_ARRAYDEF___OUT_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::ArrayDef_out
@@ -15449,8 +15448,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_WSTRINGDEF___CI_)
--#define _TAO_IR_WSTRINGDEF___CI_
+-#if !defined (_IR_WSTRINGDEF___CI_)
+-#define _IR_WSTRINGDEF___CI_
 -
  ACE_INLINE
 -IR::WstringDef::WstringDef (
@@ -15466,8 +15465,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_WSTRINGDEF___VAR_CI_)
--#define _TAO_IR_WSTRINGDEF___VAR_CI_
+-#if !defined (_IR_WSTRINGDEF___VAR_CI_)
+-#define _IR_WSTRINGDEF___VAR_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::WstringDef_var
@@ -15594,8 +15593,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_WSTRINGDEF___OUT_CI_)
--#define _TAO_IR_WSTRINGDEF___OUT_CI_
+-#if !defined (_IR_WSTRINGDEF___OUT_CI_)
+-#define _IR_WSTRINGDEF___OUT_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::WstringDef_out
@@ -15684,8 +15683,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_FIXEDDEF___CI_)
--#define _TAO_IR_FIXEDDEF___CI_
+-#if !defined (_IR_FIXEDDEF___CI_)
+-#define _IR_FIXEDDEF___CI_
 -
  ACE_INLINE
 -IR::FixedDef::FixedDef (
@@ -15701,8 +15700,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_FIXEDDEF___VAR_CI_)
--#define _TAO_IR_FIXEDDEF___VAR_CI_
+-#if !defined (_IR_FIXEDDEF___VAR_CI_)
+-#define _IR_FIXEDDEF___VAR_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::FixedDef_var
@@ -15829,8 +15828,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_FIXEDDEF___OUT_CI_)
--#define _TAO_IR_FIXEDDEF___OUT_CI_
+-#if !defined (_IR_FIXEDDEF___OUT_CI_)
+-#define _IR_FIXEDDEF___OUT_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::FixedDef_out
@@ -15919,8 +15918,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_COMPONENTREPOSITORY___CI_)
--#define _TAO_IR_COMPONENTREPOSITORY___CI_
+-#if !defined (_IR_COMPONENTREPOSITORY___CI_)
+-#define _IR_COMPONENTREPOSITORY___CI_
 -
  ACE_INLINE
 -IR::ComponentRepository::ComponentRepository (
@@ -15935,8 +15934,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_COMPONENTREPOSITORY___VAR_CI_)
--#define _TAO_IR_COMPONENTREPOSITORY___VAR_CI_
+-#if !defined (_IR_COMPONENTREPOSITORY___VAR_CI_)
+-#define _IR_COMPONENTREPOSITORY___VAR_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::ComponentRepository_var
@@ -16063,8 +16062,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_COMPONENTREPOSITORY___OUT_CI_)
--#define _TAO_IR_COMPONENTREPOSITORY___OUT_CI_
+-#if !defined (_IR_COMPONENTREPOSITORY___OUT_CI_)
+-#define _IR_COMPONENTREPOSITORY___OUT_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::ComponentRepository_out
@@ -16595,8 +16594,8 @@
  }
  
 -
--#if !defined (_TAO_IR_TYPEDEFDEF___CI_)
--#define _TAO_IR_TYPEDEFDEF___CI_
+-#if !defined (_IR_TYPEDEFDEF___CI_)
+-#define _IR_TYPEDEFDEF___CI_
 -
  ACE_INLINE
 -IR::TypedefDef::TypedefDef (
@@ -16611,8 +16610,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_TYPEDEFDEF___VAR_CI_)
--#define _TAO_IR_TYPEDEFDEF___VAR_CI_
+-#if !defined (_IR_TYPEDEFDEF___VAR_CI_)
+-#define _IR_TYPEDEFDEF___VAR_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::TypedefDef_var
@@ -16739,8 +16738,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_TYPEDEFDEF___OUT_CI_)
--#define _TAO_IR_TYPEDEFDEF___OUT_CI_
+-#if !defined (_IR_TYPEDEFDEF___OUT_CI_)
+-#define _IR_TYPEDEFDEF___OUT_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::TypedefDef_out
@@ -17273,8 +17272,8 @@
 -
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
    
--#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EXCEPTIONDEFSEQ_CI_)
--#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EXCEPTIONDEFSEQ_CI_
+-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EXCEPTIONDEFSEQ_CI_)
+-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EXCEPTIONDEFSEQ_CI_
 -
 -  ACE_INLINE IR::ExceptionDef **
 -  IR::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::allocbuf (CORBA::ULong nelems)
@@ -17446,8 +17445,8 @@
 -
  #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  
--#if !defined (_TAO_IR_EXCEPTIONDEFSEQ_CI_)
--#define _TAO_IR_EXCEPTIONDEFSEQ_CI_
+-#if !defined (_IR_EXCEPTIONDEFSEQ_CI_)
+-#define _IR_EXCEPTIONDEFSEQ_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::ExceptionDefSeq_var
@@ -17692,8 +17691,8 @@
 -
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
    
--#if !defined (_TAO__TAO_UNBOUNDED_SEQUENCE_IR_EXCDESCRIPTIONSEQ_CI_)
--#define _TAO__TAO_UNBOUNDED_SEQUENCE_IR_EXCDESCRIPTIONSEQ_CI_
+-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_EXCDESCRIPTIONSEQ_CI_)
+-#define __TAO_UNBOUNDED_SEQUENCE_IR_EXCDESCRIPTIONSEQ_CI_
 -
    // = Static operations.
 -  ACE_INLINE IR::ExceptionDescription *
@@ -17882,8 +17881,8 @@
 -
  #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  
--#if !defined (_TAO_IR_EXCDESCRIPTIONSEQ_CI_)
--#define _TAO_IR_EXCDESCRIPTIONSEQ_CI_
+-#if !defined (_IR_EXCDESCRIPTIONSEQ_CI_)
+-#define _IR_EXCDESCRIPTIONSEQ_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::ExcDescriptionSeq_var
@@ -18135,8 +18134,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_ATTRIBUTEDEF___CI_)
--#define _TAO_IR_ATTRIBUTEDEF___CI_
+-#if !defined (_IR_ATTRIBUTEDEF___CI_)
+-#define _IR_ATTRIBUTEDEF___CI_
 -
  ACE_INLINE
 -IR::AttributeDef::AttributeDef (
@@ -18151,8 +18150,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_ATTRIBUTEDEF___VAR_CI_)
--#define _TAO_IR_ATTRIBUTEDEF___VAR_CI_
+-#if !defined (_IR_ATTRIBUTEDEF___VAR_CI_)
+-#define _IR_ATTRIBUTEDEF___VAR_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::AttributeDef_var
@@ -18279,8 +18278,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_ATTRIBUTEDEF___OUT_CI_)
--#define _TAO_IR_ATTRIBUTEDEF___OUT_CI_
+-#if !defined (_IR_ATTRIBUTEDEF___OUT_CI_)
+-#define _IR_ATTRIBUTEDEF___OUT_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::AttributeDef_out
@@ -18813,8 +18812,8 @@
 -
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
    
--#if !defined (_TAO__TAO_UNBOUNDED_SEQUENCE_IR_PARDESCRIPTIONSEQ_CI_)
--#define _TAO__TAO_UNBOUNDED_SEQUENCE_IR_PARDESCRIPTIONSEQ_CI_
+-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_PARDESCRIPTIONSEQ_CI_)
+-#define __TAO_UNBOUNDED_SEQUENCE_IR_PARDESCRIPTIONSEQ_CI_
 -
    // = Static operations.
 -  ACE_INLINE IR::ParameterDescription *
@@ -19003,8 +19002,8 @@
 -
  #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  
--#if !defined (_TAO_IR_PARDESCRIPTIONSEQ_CI_)
--#define _TAO_IR_PARDESCRIPTIONSEQ_CI_
+-#if !defined (_IR_PARDESCRIPTIONSEQ_CI_)
+-#define _IR_PARDESCRIPTIONSEQ_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::ParDescriptionSeq_var
@@ -19256,8 +19255,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_CONTEXTIDSEQ_CI_)
--#define _TAO_IR_CONTEXTIDSEQ_CI_
+-#if !defined (_IR_CONTEXTIDSEQ_CI_)
+-#define _IR_CONTEXTIDSEQ_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::ContextIdSeq_var
@@ -19498,8 +19497,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_OPERATIONDEF___CI_)
--#define _TAO_IR_OPERATIONDEF___CI_
+-#if !defined (_IR_OPERATIONDEF___CI_)
+-#define _IR_OPERATIONDEF___CI_
 -
  ACE_INLINE
 -IR::OperationDef::OperationDef (
@@ -19514,8 +19513,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_OPERATIONDEF___VAR_CI_)
--#define _TAO_IR_OPERATIONDEF___VAR_CI_
+-#if !defined (_IR_OPERATIONDEF___VAR_CI_)
+-#define _IR_OPERATIONDEF___VAR_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::OperationDef_var
@@ -19642,8 +19641,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_OPERATIONDEF___OUT_CI_)
--#define _TAO_IR_OPERATIONDEF___OUT_CI_
+-#if !defined (_IR_OPERATIONDEF___OUT_CI_)
+-#define _IR_OPERATIONDEF___OUT_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::OperationDef_out
@@ -19953,8 +19952,8 @@
  }
  
 -
--#if !defined (_TAO_IR_REPOSITORYIDSEQ_CI_)
--#define _TAO_IR_REPOSITORYIDSEQ_CI_
+-#if !defined (_IR_REPOSITORYIDSEQ_CI_)
+-#define _IR_REPOSITORYIDSEQ_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::RepositoryIdSeq_var
@@ -20197,8 +20196,8 @@
 -
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
    
--#if !defined (_TAO__TAO_UNBOUNDED_SEQUENCE_IR_OPDESCRIPTIONSEQ_CI_)
--#define _TAO__TAO_UNBOUNDED_SEQUENCE_IR_OPDESCRIPTIONSEQ_CI_
+-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_OPDESCRIPTIONSEQ_CI_)
+-#define __TAO_UNBOUNDED_SEQUENCE_IR_OPDESCRIPTIONSEQ_CI_
 -
    // = Static operations.
 -  ACE_INLINE IR::OperationDescription *
@@ -20387,8 +20386,8 @@
 -
  #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  
--#if !defined (_TAO_IR_OPDESCRIPTIONSEQ_CI_)
--#define _TAO_IR_OPDESCRIPTIONSEQ_CI_
+-#if !defined (_IR_OPDESCRIPTIONSEQ_CI_)
+-#define _IR_OPDESCRIPTIONSEQ_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::OpDescriptionSeq_var
@@ -20642,8 +20641,8 @@
 -
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
    
--#if !defined (_TAO__TAO_UNBOUNDED_SEQUENCE_IR_ATTRDESCRIPTIONSEQ_CI_)
--#define _TAO__TAO_UNBOUNDED_SEQUENCE_IR_ATTRDESCRIPTIONSEQ_CI_
+-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_ATTRDESCRIPTIONSEQ_CI_)
+-#define __TAO_UNBOUNDED_SEQUENCE_IR_ATTRDESCRIPTIONSEQ_CI_
 -
    // = Static operations.
 -  ACE_INLINE IR::AttributeDescription *
@@ -20832,8 +20831,8 @@
 -
  #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  
--#if !defined (_TAO_IR_ATTRDESCRIPTIONSEQ_CI_)
--#define _TAO_IR_ATTRDESCRIPTIONSEQ_CI_
+-#if !defined (_IR_ATTRDESCRIPTIONSEQ_CI_)
+-#define _IR_ATTRDESCRIPTIONSEQ_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::AttrDescriptionSeq_var
@@ -21529,8 +21528,8 @@
 -
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
    
--#if !defined (_TAO__TAO_UNBOUNDED_SEQUENCE_IR_VALUEMEMBERSEQ_CI_)
--#define _TAO__TAO_UNBOUNDED_SEQUENCE_IR_VALUEMEMBERSEQ_CI_
+-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_VALUEMEMBERSEQ_CI_)
+-#define __TAO_UNBOUNDED_SEQUENCE_IR_VALUEMEMBERSEQ_CI_
 -
    // = Static operations.
 -  ACE_INLINE IR::ValueMember *
@@ -21719,8 +21718,8 @@
 -
  #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  
--#if !defined (_TAO_IR_VALUEMEMBERSEQ_CI_)
--#define _TAO_IR_VALUEMEMBERSEQ_CI_
+-#if !defined (_IR_VALUEMEMBERSEQ_CI_)
+-#define _IR_VALUEMEMBERSEQ_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::ValueMemberSeq_var
@@ -21972,8 +21971,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_VALUEMEMBERDEF___CI_)
--#define _TAO_IR_VALUEMEMBERDEF___CI_
+-#if !defined (_IR_VALUEMEMBERDEF___CI_)
+-#define _IR_VALUEMEMBERDEF___CI_
 -
  ACE_INLINE
 -IR::ValueMemberDef::ValueMemberDef (
@@ -21988,8 +21987,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_VALUEMEMBERDEF___VAR_CI_)
--#define _TAO_IR_VALUEMEMBERDEF___VAR_CI_
+-#if !defined (_IR_VALUEMEMBERDEF___VAR_CI_)
+-#define _IR_VALUEMEMBERDEF___VAR_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::ValueMemberDef_var
@@ -22116,8 +22115,8 @@
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_TAO_IR_VALUEMEMBERDEF___OUT_CI_)
--#define _TAO_IR_VALUEMEMBERDEF___OUT_CI_
+-#if !defined (_IR_VALUEMEMBERDEF___OUT_CI_)
+-#define _IR_VALUEMEMBERDEF___OUT_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::ValueMemberDef_out
@@ -22871,8 +22870,8 @@
 -
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
    
--#if !defined (_TAO__TAO_UNBOUNDED_SEQUENCE_IR_PROVIDESDESCSEQ_CI_)
--#define _TAO__TAO_UNBOUNDED_SEQUENCE_IR_PROVIDESDESCSEQ_CI_
+-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_PROVIDESDESCSEQ_CI_)
+-#define __TAO_UNBOUNDED_SEQUENCE_IR_PROVIDESDESCSEQ_CI_
 -
    // = Static operations.
 -  ACE_INLINE IR::ProvidesDescription *
@@ -23061,8 +23060,8 @@
 -
  #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  
--#if !defined (_TAO_IR_PROVIDESDESCSEQ_CI_)
--#define _TAO_IR_PROVIDESDESCSEQ_CI_
+-#if !defined (_IR_PROVIDESDESCSEQ_CI_)
+-#define _IR_PROVIDESDESCSEQ_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::ProvidesDescSeq_var
@@ -23316,8 +23315,8 @@
 -
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
    
--#if !defined (_TAO__TAO_UNBOUNDED_SEQUENCE_IR_USESDESCSEQ_CI_)
--#define _TAO__TAO_UNBOUNDED_SEQUENCE_IR_USESDESCSEQ_CI_
+-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_USESDESCSEQ_CI_)
+-#define __TAO_UNBOUNDED_SEQUENCE_IR_USESDESCSEQ_CI_
 -
    // = Static operations.
 -  ACE_INLINE IR::UsesDescription *
@@ -23506,8 +23505,8 @@
 -
  #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  
--#if !defined (_TAO_IR_USESDESCSEQ_CI_)
--#define _TAO_IR_USESDESCSEQ_CI_
+-#if !defined (_IR_USESDESCSEQ_CI_)
+-#define _IR_USESDESCSEQ_CI_
 -
  // *************************************************************
 -// Inline operations for class IR::UsesDescSeq_var
@@ -24662,29 +24661,28 @@
      }
    
    return _tao_result;
-@@ -20170,18 +19033,18 @@
+@@ -20169,19 +19032,8 @@
+ 
  ACE_INLINE CORBA::Boolean
  operator<< (
-     TAO_OutputCDR &,
+-    TAO_OutputCDR &,
 -    const CORBA::IRObject_ptr
-+    const CORBA_IRObject_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    CORBA::IRObject_ptr &
-+    CORBA_IRObject_ptr &
-   );
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
+-  );
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
      TAO_OutputCDR &strm,
 -    const CORBA::IRObject_ptr _tao_objref
 +    const CORBA_IRObject_ptr _tao_objref
    )
  {
    CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -20191,7 +19054,7 @@
+@@ -20191,7 +19043,7 @@
  ACE_INLINE CORBA::Boolean
  operator>> (
      TAO_InputCDR &strm,
@@ -24693,7 +24691,7 @@
    )
  {
    ACE_TRY_NEW_ENV
-@@ -20201,7 +19064,7 @@
+@@ -20201,7 +19053,7 @@
        return 0;
      // narrow to the right type
      _tao_objref =
@@ -24702,62 +24700,57 @@
            obj.in (),
            ACE_TRY_ENV
          );
-@@ -20219,45 +19082,45 @@
- ACE_INLINE CORBA::Boolean
- operator<< (
-     TAO_OutputCDR &,
+@@ -20216,48 +19068,7 @@
+   return 0;
+ }
+ 
+-ACE_INLINE CORBA::Boolean
+-operator<< (
+-    TAO_OutputCDR &,
 -    const IR::Contained_ptr
-+    const IR_Contained_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::Contained_ptr &
-+    IR_Contained_ptr &
-   );
- ACE_INLINE CORBA::Boolean
- operator<< (
-     TAO_OutputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator<< (
+-    TAO_OutputCDR &,
 -    const IR::Repository_ptr
-+    const IR_Repository_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::Repository_ptr &
-+    IR_Repository_ptr &
-   );
- ACE_INLINE CORBA::Boolean
- operator<< (
-     TAO_OutputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator<< (
+-    TAO_OutputCDR &,
 -    const IR::Container_ptr
-+    const IR_Container_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::Container_ptr &
-+    IR_Container_ptr &
-   );
- ACE_INLINE CORBA::Boolean
- operator<< (
-     TAO_OutputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator<< (
+-    TAO_OutputCDR &,
 -    const IR::Contained_ptr
-+    const IR_Contained_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::Contained_ptr &
-+    IR_Contained_ptr &
-   );
- 
+-  );
+-
 -ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::Contained::Description &_tao_aggregate)
 +ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_Contained::Description &_tao_aggregate)
  {
    if (
      (strm << _tao_aggregate.kind) &&
-@@ -20269,7 +19132,7 @@
+@@ -20269,7 +19080,7 @@
    
  }
  
@@ -24766,7 +24759,7 @@
  {
    if (
      (strm >> _tao_aggregate.kind) &&
-@@ -20284,7 +19147,7 @@
+@@ -20284,7 +19095,7 @@
  ACE_INLINE CORBA::Boolean
  operator<< (
      TAO_OutputCDR &strm,
@@ -24775,7 +24768,7 @@
    )
  {
    CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -20294,7 +19157,7 @@
+@@ -20294,7 +19105,7 @@
  ACE_INLINE CORBA::Boolean
  operator>> (
      TAO_InputCDR &strm,
@@ -24784,7 +24777,7 @@
    )
  {
    ACE_TRY_NEW_ENV
-@@ -20304,7 +19167,7 @@
+@@ -20304,7 +19115,7 @@
        return 0;
      // narrow to the right type
      _tao_objref =
@@ -24793,517 +24786,488 @@
            obj.in (),
            ACE_TRY_ENV
          );
-@@ -20322,114 +19185,114 @@
- ACE_INLINE CORBA::Boolean
- operator<< (
+@@ -20319,417 +19130,133 @@
+   return 0;
+ }
+ 
+-ACE_INLINE CORBA::Boolean
+-operator<< (
++CORBA::Boolean TAO_Export operator<< (
      TAO_OutputCDR &,
 -    const IR::ModuleDef_ptr
-+    const IR_ModuleDef_ptr
++    const IR_InterfaceDefSeq &
    );
- ACE_INLINE CORBA::Boolean
- operator>> (
+-ACE_INLINE CORBA::Boolean
+-operator>> (
++
++CORBA::Boolean TAO_Export operator>> (
      TAO_InputCDR &,
 -    IR::ModuleDef_ptr &
-+    IR_ModuleDef_ptr &
++    IR_InterfaceDefSeq &
    );
- ACE_INLINE CORBA::Boolean
- operator<< (
+-ACE_INLINE CORBA::Boolean
+-operator<< (
++
++CORBA::Boolean TAO_Export operator<< (
      TAO_OutputCDR &,
 -    const IR::ConstantDef_ptr
-+    const IR_ConstantDef_ptr
++    const IR_ValueDefSeq &
    );
- ACE_INLINE CORBA::Boolean
- operator>> (
+-ACE_INLINE CORBA::Boolean
+-operator>> (
++
++CORBA::Boolean TAO_Export operator>> (
      TAO_InputCDR &,
 -    IR::ConstantDef_ptr &
-+    IR_ConstantDef_ptr &
++    IR_ValueDefSeq &
    );
- ACE_INLINE CORBA::Boolean
- operator<< (
+-ACE_INLINE CORBA::Boolean
+-operator<< (
++
++CORBA::Boolean TAO_Export operator<< (
      TAO_OutputCDR &,
 -    const IR::IDLType_ptr
-+    const IR_IDLType_ptr
++    const IR_ComponentDefSeq &
    );
- ACE_INLINE CORBA::Boolean
- operator>> (
+-ACE_INLINE CORBA::Boolean
+-operator>> (
++
++CORBA::Boolean TAO_Export operator>> (
      TAO_InputCDR &,
 -    IR::IDLType_ptr &
-+    IR_IDLType_ptr &
++    IR_ComponentDefSeq &
    );
- ACE_INLINE CORBA::Boolean
- operator<< (
+-ACE_INLINE CORBA::Boolean
+-operator<< (
++
++CORBA::Boolean TAO_Export operator<< (
      TAO_OutputCDR &,
 -    const IR::StructDef_ptr
-+    const IR_StructDef_ptr
++    const IR_ProvidesDefSeq &
    );
- ACE_INLINE CORBA::Boolean
- operator>> (
+-ACE_INLINE CORBA::Boolean
+-operator>> (
++
++CORBA::Boolean TAO_Export operator>> (
      TAO_InputCDR &,
 -    IR::StructDef_ptr &
-+    IR_StructDef_ptr &
++    IR_ProvidesDefSeq &
    );
- ACE_INLINE CORBA::Boolean
- operator<< (
+-ACE_INLINE CORBA::Boolean
+-operator<< (
++
++CORBA::Boolean TAO_Export operator<< (
      TAO_OutputCDR &,
 -    const IR::UnionDef_ptr
-+    const IR_UnionDef_ptr
++    const IR_UsesDefSeq &
    );
- ACE_INLINE CORBA::Boolean
- operator>> (
+-ACE_INLINE CORBA::Boolean
+-operator>> (
++
++CORBA::Boolean TAO_Export operator>> (
      TAO_InputCDR &,
 -    IR::UnionDef_ptr &
-+    IR_UnionDef_ptr &
++    IR_UsesDefSeq &
    );
- ACE_INLINE CORBA::Boolean
- operator<< (
+-ACE_INLINE CORBA::Boolean
+-operator<< (
++
++CORBA::Boolean TAO_Export operator<< (
      TAO_OutputCDR &,
 -    const IR::EnumDef_ptr
-+    const IR_EnumDef_ptr
++    const IR_HomeDefSeq &
    );
- ACE_INLINE CORBA::Boolean
- operator>> (
+-ACE_INLINE CORBA::Boolean
+-operator>> (
++
++CORBA::Boolean TAO_Export operator>> (
      TAO_InputCDR &,
 -    IR::EnumDef_ptr &
-+    IR_EnumDef_ptr &
++    IR_HomeDefSeq &
    );
- ACE_INLINE CORBA::Boolean
- operator<< (
+-ACE_INLINE CORBA::Boolean
+-operator<< (
++
++CORBA::Boolean TAO_Export operator<< (
      TAO_OutputCDR &,
 -    const IR::AliasDef_ptr
-+    const IR_AliasDef_ptr
++    const IR_EmitsDefSeq &
    );
- ACE_INLINE CORBA::Boolean
- operator>> (
+-ACE_INLINE CORBA::Boolean
+-operator>> (
++CORBA::Boolean TAO_Export operator>> (
      TAO_InputCDR &,
 -    IR::AliasDef_ptr &
-+    IR_AliasDef_ptr &
++    IR_EmitsDefSeq &
    );
- ACE_INLINE CORBA::Boolean
- operator<< (
+-ACE_INLINE CORBA::Boolean
+-operator<< (
++
++CORBA::Boolean TAO_Export operator<< (
      TAO_OutputCDR &,
 -    const IR::InterfaceDef_ptr
-+    const IR_InterfaceDef_ptr
++    const IR_PublishesDefSeq &
    );
- ACE_INLINE CORBA::Boolean
- operator>> (
+-ACE_INLINE CORBA::Boolean
+-operator>> (
++CORBA::Boolean TAO_Export operator>> (
      TAO_InputCDR &,
 -    IR::InterfaceDef_ptr &
-+    IR_InterfaceDef_ptr &
++    IR_PublishesDefSeq &
    );
- ACE_INLINE CORBA::Boolean
- operator<< (
+-ACE_INLINE CORBA::Boolean
+-operator<< (
++
++CORBA::Boolean TAO_Export operator<< (
      TAO_OutputCDR &,
 -    const IR::ExceptionDef_ptr
-+    const IR_ExceptionDef_ptr
++    const IR_ConsumesDefSeq &
    );
- ACE_INLINE CORBA::Boolean
- operator>> (
+-ACE_INLINE CORBA::Boolean
+-operator>> (
++CORBA::Boolean TAO_Export operator>> (
      TAO_InputCDR &,
 -    IR::ExceptionDef_ptr &
-+    IR_ExceptionDef_ptr &
++    IR_ConsumesDefSeq &
    );
- ACE_INLINE CORBA::Boolean
- operator<< (
+-ACE_INLINE CORBA::Boolean
+-operator<< (
++
++CORBA::Boolean TAO_Export operator<< (
      TAO_OutputCDR &,
 -    const IR::NativeDef_ptr
-+    const IR_NativeDef_ptr
++    const IR_FactoryDefSeq &
    );
- ACE_INLINE CORBA::Boolean
- operator>> (
+-ACE_INLINE CORBA::Boolean
+-operator>> (
++CORBA::Boolean TAO_Export operator>> (
      TAO_InputCDR &,
 -    IR::NativeDef_ptr &
-+    IR_NativeDef_ptr &
++    IR_FactoryDefSeq &
    );
  
- #if !defined _TAO_CDR_OP_IR_InterfaceDefSeq_I_
- #define _TAO_CDR_OP_IR_InterfaceDefSeq_I_
- 
--CORBA::Boolean TAO_Export operator<< (
-+CORBA::Boolean  operator<< (
+-#if !defined _TAO_CDR_OP_IR_InterfaceDefSeq_I_
+-#define _TAO_CDR_OP_IR_InterfaceDefSeq_I_
+-
+ CORBA::Boolean TAO_Export operator<< (
      TAO_OutputCDR &,
 -    const IR::InterfaceDefSeq &
-+    const IR_InterfaceDefSeq &
++    const IR_FinderDefSeq &
    );
--CORBA::Boolean TAO_Export operator>> (
-+CORBA::Boolean  operator>> (
+ CORBA::Boolean TAO_Export operator>> (
      TAO_InputCDR &,
 -    IR::InterfaceDefSeq &
-+    IR_InterfaceDefSeq &
++    IR_FinderDefSeq &
    );
  
- #endif /* _TAO_CDR_OP_IR_InterfaceDefSeq_I_ */
-@@ -20437,24 +19300,24 @@
- ACE_INLINE CORBA::Boolean
- operator<< (
+-#endif /* _TAO_CDR_OP_IR_InterfaceDefSeq_I_ */
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
++CORBA::Boolean TAO_Export operator<< (
      TAO_OutputCDR &,
 -    const IR::ValueDef_ptr
-+    const IR_ValueDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::ValueDef_ptr &
-+    IR_ValueDef_ptr &
-   );
- 
- #if !defined _TAO_CDR_OP_IR_ValueDefSeq_I_
- #define _TAO_CDR_OP_IR_ValueDefSeq_I_
- 
+-  );
+-
+-#if !defined _TAO_CDR_OP_IR_ValueDefSeq_I_
+-#define _TAO_CDR_OP_IR_ValueDefSeq_I_
+-
 -CORBA::Boolean TAO_Export operator<< (
-+CORBA::Boolean  operator<< (
-     TAO_OutputCDR &,
+-    TAO_OutputCDR &,
 -    const IR::ValueDefSeq &
-+    const IR_ValueDefSeq &
-   );
+-  );
 -CORBA::Boolean TAO_Export operator>> (
-+CORBA::Boolean  operator>> (
-     TAO_InputCDR &,
+-    TAO_InputCDR &,
 -    IR::ValueDefSeq &
-+    IR_ValueDefSeq &
-   );
- 
- #endif /* _TAO_CDR_OP_IR_ValueDefSeq_I_ */
-@@ -20462,34 +19325,34 @@
- ACE_INLINE CORBA::Boolean
- operator<< (
-     TAO_OutputCDR &,
+-  );
+-
+-#endif /* _TAO_CDR_OP_IR_ValueDefSeq_I_ */
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
+-    TAO_OutputCDR &,
 -    const IR::ValueBoxDef_ptr
-+    const IR_ValueBoxDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::ValueBoxDef_ptr &
-+    IR_ValueBoxDef_ptr &
-   );
- ACE_INLINE CORBA::Boolean
- operator<< (
-     TAO_OutputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator<< (
+-    TAO_OutputCDR &,
 -    const IR::ComponentDef_ptr
-+    const IR_ComponentDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::ComponentDef_ptr &
-+    IR_ComponentDef_ptr &
-   );
- 
- #if !defined _TAO_CDR_OP_IR_ComponentDefSeq_I_
- #define _TAO_CDR_OP_IR_ComponentDefSeq_I_
- 
+-  );
+-
+-#if !defined _TAO_CDR_OP_IR_ComponentDefSeq_I_
+-#define _TAO_CDR_OP_IR_ComponentDefSeq_I_
+-
 -CORBA::Boolean TAO_Export operator<< (
-+CORBA::Boolean  operator<< (
-     TAO_OutputCDR &,
+-    TAO_OutputCDR &,
 -    const IR::ComponentDefSeq &
-+    const IR_ComponentDefSeq &
-   );
+-  );
 -CORBA::Boolean TAO_Export operator>> (
-+CORBA::Boolean  operator>> (
-     TAO_InputCDR &,
+-    TAO_InputCDR &,
 -    IR::ComponentDefSeq &
-+    IR_ComponentDefSeq &
-   );
- 
- #endif /* _TAO_CDR_OP_IR_ComponentDefSeq_I_ */
-@@ -20497,24 +19360,24 @@
- ACE_INLINE CORBA::Boolean
- operator<< (
-     TAO_OutputCDR &,
+-  );
+-
+-#endif /* _TAO_CDR_OP_IR_ComponentDefSeq_I_ */
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
+-    TAO_OutputCDR &,
 -    const IR::ProvidesDef_ptr
-+    const IR_ProvidesDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::ProvidesDef_ptr &
-+    IR_ProvidesDef_ptr &
-   );
- 
- #if !defined _TAO_CDR_OP_IR_ProvidesDefSeq_I_
- #define _TAO_CDR_OP_IR_ProvidesDefSeq_I_
- 
+-  );
+-
+-#if !defined _TAO_CDR_OP_IR_ProvidesDefSeq_I_
+-#define _TAO_CDR_OP_IR_ProvidesDefSeq_I_
+-
 -CORBA::Boolean TAO_Export operator<< (
-+CORBA::Boolean  operator<< (
-     TAO_OutputCDR &,
+-    TAO_OutputCDR &,
 -    const IR::ProvidesDefSeq &
-+    const IR_ProvidesDefSeq &
-   );
+-  );
 -CORBA::Boolean TAO_Export operator>> (
-+CORBA::Boolean  operator>> (
-     TAO_InputCDR &,
+-    TAO_InputCDR &,
 -    IR::ProvidesDefSeq &
-+    IR_ProvidesDefSeq &
-   );
- 
- #endif /* _TAO_CDR_OP_IR_ProvidesDefSeq_I_ */
-@@ -20522,24 +19385,24 @@
- ACE_INLINE CORBA::Boolean
- operator<< (
-     TAO_OutputCDR &,
+-  );
+-
+-#endif /* _TAO_CDR_OP_IR_ProvidesDefSeq_I_ */
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
+-    TAO_OutputCDR &,
 -    const IR::UsesDef_ptr
-+    const IR_UsesDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::UsesDef_ptr &
-+    IR_UsesDef_ptr &
-   );
- 
- #if !defined _TAO_CDR_OP_IR_UsesDefSeq_I_
- #define _TAO_CDR_OP_IR_UsesDefSeq_I_
- 
+-  );
+-
+-#if !defined _TAO_CDR_OP_IR_UsesDefSeq_I_
+-#define _TAO_CDR_OP_IR_UsesDefSeq_I_
+-
 -CORBA::Boolean TAO_Export operator<< (
-+CORBA::Boolean  operator<< (
-     TAO_OutputCDR &,
+-    TAO_OutputCDR &,
 -    const IR::UsesDefSeq &
-+    const IR_UsesDefSeq &
-   );
+-  );
 -CORBA::Boolean TAO_Export operator>> (
-+CORBA::Boolean  operator>> (
-     TAO_InputCDR &,
+-    TAO_InputCDR &,
 -    IR::UsesDefSeq &
-+    IR_UsesDefSeq &
-   );
- 
- #endif /* _TAO_CDR_OP_IR_UsesDefSeq_I_ */
-@@ -20547,24 +19410,24 @@
- ACE_INLINE CORBA::Boolean
- operator<< (
-     TAO_OutputCDR &,
+-  );
+-
+-#endif /* _TAO_CDR_OP_IR_UsesDefSeq_I_ */
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
+-    TAO_OutputCDR &,
 -    const IR::HomeDef_ptr
-+    const IR_HomeDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::HomeDef_ptr &
-+    IR_HomeDef_ptr &
-   );
- 
- #if !defined _TAO_CDR_OP_IR_HomeDefSeq_I_
- #define _TAO_CDR_OP_IR_HomeDefSeq_I_
- 
+-  );
+-
+-#if !defined _TAO_CDR_OP_IR_HomeDefSeq_I_
+-#define _TAO_CDR_OP_IR_HomeDefSeq_I_
+-
 -CORBA::Boolean TAO_Export operator<< (
-+CORBA::Boolean  operator<< (
-     TAO_OutputCDR &,
+-    TAO_OutputCDR &,
 -    const IR::HomeDefSeq &
-+    const IR_HomeDefSeq &
-   );
+-  );
 -CORBA::Boolean TAO_Export operator>> (
-+CORBA::Boolean  operator>> (
-     TAO_InputCDR &,
+-    TAO_InputCDR &,
 -    IR::HomeDefSeq &
-+    IR_HomeDefSeq &
-   );
- 
- #endif /* _TAO_CDR_OP_IR_HomeDefSeq_I_ */
-@@ -20572,34 +19435,34 @@
- ACE_INLINE CORBA::Boolean
- operator<< (
-     TAO_OutputCDR &,
+-  );
+-
+-#endif /* _TAO_CDR_OP_IR_HomeDefSeq_I_ */
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
+-    TAO_OutputCDR &,
 -    const IR::EventDef_ptr
-+    const IR_EventDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::EventDef_ptr &
-+    IR_EventDef_ptr &
-   );
- ACE_INLINE CORBA::Boolean
- operator<< (
-     TAO_OutputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator<< (
+-    TAO_OutputCDR &,
 -    const IR::EmitsDef_ptr
-+    const IR_EmitsDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::EmitsDef_ptr &
-+    IR_EmitsDef_ptr &
-   );
- 
- #if !defined _TAO_CDR_OP_IR_EmitsDefSeq_I_
- #define _TAO_CDR_OP_IR_EmitsDefSeq_I_
- 
+-  );
+-
+-#if !defined _TAO_CDR_OP_IR_EmitsDefSeq_I_
+-#define _TAO_CDR_OP_IR_EmitsDefSeq_I_
+-
 -CORBA::Boolean TAO_Export operator<< (
-+CORBA::Boolean  operator<< (
-     TAO_OutputCDR &,
+-    TAO_OutputCDR &,
 -    const IR::EmitsDefSeq &
-+    const IR_EmitsDefSeq &
-   );
+-  );
 -CORBA::Boolean TAO_Export operator>> (
-+CORBA::Boolean  operator>> (
-     TAO_InputCDR &,
+-    TAO_InputCDR &,
 -    IR::EmitsDefSeq &
-+    IR_EmitsDefSeq &
-   );
- 
- #endif /* _TAO_CDR_OP_IR_EmitsDefSeq_I_ */
-@@ -20607,24 +19470,24 @@
- ACE_INLINE CORBA::Boolean
- operator<< (
-     TAO_OutputCDR &,
+-  );
+-
+-#endif /* _TAO_CDR_OP_IR_EmitsDefSeq_I_ */
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
+-    TAO_OutputCDR &,
 -    const IR::PublishesDef_ptr
-+    const IR_PublishesDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::PublishesDef_ptr &
-+    IR_PublishesDef_ptr &
-   );
- 
- #if !defined _TAO_CDR_OP_IR_PublishesDefSeq_I_
- #define _TAO_CDR_OP_IR_PublishesDefSeq_I_
- 
+-  );
+-
+-#if !defined _TAO_CDR_OP_IR_PublishesDefSeq_I_
+-#define _TAO_CDR_OP_IR_PublishesDefSeq_I_
+-
 -CORBA::Boolean TAO_Export operator<< (
-+CORBA::Boolean  operator<< (
-     TAO_OutputCDR &,
+-    TAO_OutputCDR &,
 -    const IR::PublishesDefSeq &
-+    const IR_PublishesDefSeq &
-   );
+-  );
 -CORBA::Boolean TAO_Export operator>> (
-+CORBA::Boolean  operator>> (
-     TAO_InputCDR &,
+-    TAO_InputCDR &,
 -    IR::PublishesDefSeq &
-+    IR_PublishesDefSeq &
-   );
- 
- #endif /* _TAO_CDR_OP_IR_PublishesDefSeq_I_ */
-@@ -20632,24 +19495,24 @@
- ACE_INLINE CORBA::Boolean
- operator<< (
-     TAO_OutputCDR &,
+-  );
+-
+-#endif /* _TAO_CDR_OP_IR_PublishesDefSeq_I_ */
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
+-    TAO_OutputCDR &,
 -    const IR::ConsumesDef_ptr
-+    const IR_ConsumesDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::ConsumesDef_ptr &
-+    IR_ConsumesDef_ptr &
-   );
- 
- #if !defined _TAO_CDR_OP_IR_ConsumesDefSeq_I_
- #define _TAO_CDR_OP_IR_ConsumesDefSeq_I_
- 
+-  );
+-
+-#if !defined _TAO_CDR_OP_IR_ConsumesDefSeq_I_
+-#define _TAO_CDR_OP_IR_ConsumesDefSeq_I_
+-
 -CORBA::Boolean TAO_Export operator<< (
-+CORBA::Boolean  operator<< (
-     TAO_OutputCDR &,
+-    TAO_OutputCDR &,
 -    const IR::ConsumesDefSeq &
-+    const IR_ConsumesDefSeq &
++    const IR_ContainedSeq &
    );
--CORBA::Boolean TAO_Export operator>> (
-+CORBA::Boolean  operator>> (
+ CORBA::Boolean TAO_Export operator>> (
      TAO_InputCDR &,
 -    IR::ConsumesDefSeq &
-+    IR_ConsumesDefSeq &
++    IR_ContainedSeq &
    );
  
- #endif /* _TAO_CDR_OP_IR_ConsumesDefSeq_I_ */
-@@ -20657,24 +19520,24 @@
+-#endif /* _TAO_CDR_OP_IR_ConsumesDefSeq_I_ */
+-
  ACE_INLINE CORBA::Boolean
  operator<< (
      TAO_OutputCDR &,
 -    const IR::FactoryDef_ptr
-+    const IR_FactoryDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::FactoryDef_ptr &
-+    IR_FactoryDef_ptr &
++    const IR_IDLType_ptr
    );
  
- #if !defined _TAO_CDR_OP_IR_FactoryDefSeq_I_
- #define _TAO_CDR_OP_IR_FactoryDefSeq_I_
- 
+-#if !defined _TAO_CDR_OP_IR_FactoryDefSeq_I_
+-#define _TAO_CDR_OP_IR_FactoryDefSeq_I_
+-
 -CORBA::Boolean TAO_Export operator<< (
-+CORBA::Boolean  operator<< (
-     TAO_OutputCDR &,
+-    TAO_OutputCDR &,
 -    const IR::FactoryDefSeq &
-+    const IR_FactoryDefSeq &
-   );
+-  );
 -CORBA::Boolean TAO_Export operator>> (
-+CORBA::Boolean  operator>> (
-     TAO_InputCDR &,
+-    TAO_InputCDR &,
 -    IR::FactoryDefSeq &
-+    IR_FactoryDefSeq &
-   );
- 
- #endif /* _TAO_CDR_OP_IR_FactoryDefSeq_I_ */
-@@ -20682,24 +19545,24 @@
- ACE_INLINE CORBA::Boolean
- operator<< (
-     TAO_OutputCDR &,
+-  );
+-
+-#endif /* _TAO_CDR_OP_IR_FactoryDefSeq_I_ */
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
+-    TAO_OutputCDR &,
 -    const IR::FinderDef_ptr
-+    const IR_FinderDef_ptr
-   );
+-  );
  ACE_INLINE CORBA::Boolean
  operator>> (
      TAO_InputCDR &,
 -    IR::FinderDef_ptr &
-+    IR_FinderDef_ptr &
++    IR_IDLType_ptr &
    );
  
- #if !defined _TAO_CDR_OP_IR_FinderDefSeq_I_
- #define _TAO_CDR_OP_IR_FinderDefSeq_I_
- 
+-#if !defined _TAO_CDR_OP_IR_FinderDefSeq_I_
+-#define _TAO_CDR_OP_IR_FinderDefSeq_I_
+-
 -CORBA::Boolean TAO_Export operator<< (
-+CORBA::Boolean  operator<< (
-     TAO_OutputCDR &,
+-    TAO_OutputCDR &,
 -    const IR::FinderDefSeq &
-+    const IR_FinderDefSeq &
-   );
+-  );
 -CORBA::Boolean TAO_Export operator>> (
-+CORBA::Boolean  operator>> (
-     TAO_InputCDR &,
+-    TAO_InputCDR &,
 -    IR::FinderDefSeq &
-+    IR_FinderDefSeq &
-   );
- 
- #endif /* _TAO_CDR_OP_IR_FinderDefSeq_I_ */
-@@ -20707,29 +19570,29 @@
- ACE_INLINE CORBA::Boolean
- operator<< (
-     TAO_OutputCDR &,
+-  );
+-
+-#endif /* _TAO_CDR_OP_IR_FinderDefSeq_I_ */
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
+-    TAO_OutputCDR &,
 -    const IR::PrimaryKeyDef_ptr
-+    const IR_PrimaryKeyDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::PrimaryKeyDef_ptr &
-+    IR_PrimaryKeyDef_ptr &
-   );
- 
- #if !defined _TAO_CDR_OP_IR_ContainedSeq_I_
- #define _TAO_CDR_OP_IR_ContainedSeq_I_
- 
+-  );
+-
+-#if !defined _TAO_CDR_OP_IR_ContainedSeq_I_
+-#define _TAO_CDR_OP_IR_ContainedSeq_I_
+-
 -CORBA::Boolean TAO_Export operator<< (
-+CORBA::Boolean  operator<< (
-     TAO_OutputCDR &,
+-    TAO_OutputCDR &,
 -    const IR::ContainedSeq &
-+    const IR_ContainedSeq &
-   );
+-  );
 -CORBA::Boolean TAO_Export operator>> (
-+CORBA::Boolean  operator>> (
-     TAO_InputCDR &,
+-    TAO_InputCDR &,
 -    IR::ContainedSeq &
-+    IR_ContainedSeq &
-   );
- 
- #endif /* _TAO_CDR_OP_IR_ContainedSeq_I_ */
- 
+-  );
+-
+-#endif /* _TAO_CDR_OP_IR_ContainedSeq_I_ */
+-
 -ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::StructMember &_tao_aggregate)
 +ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_StructMember &_tao_aggregate)
  {
    if (
      (strm << _tao_aggregate.name.in ()) &&
-@@ -20742,7 +19605,7 @@
+@@ -20742,7 +19269,7 @@
    
  }
  
@@ -25312,31 +25276,33 @@
  {
    if (
      (strm >> _tao_aggregate.name.out ()) &&
-@@ -20759,18 +19622,18 @@
- #if !defined _TAO_CDR_OP_IR_StructMemberSeq_I_
- #define _TAO_CDR_OP_IR_StructMemberSeq_I_
+@@ -20755,22 +19282,16 @@
+   
+ }
  
--CORBA::Boolean TAO_Export operator<< (
-+CORBA::Boolean  operator<< (
+-
+-#if !defined _TAO_CDR_OP_IR_StructMemberSeq_I_
+-#define _TAO_CDR_OP_IR_StructMemberSeq_I_
+-
+ CORBA::Boolean TAO_Export operator<< (
      TAO_OutputCDR &,
 -    const IR::StructMemberSeq &
 +    const IR_StructMemberSeq &
    );
--CORBA::Boolean TAO_Export operator>> (
-+CORBA::Boolean  operator>> (
+ CORBA::Boolean TAO_Export operator>> (
      TAO_InputCDR &,
 -    IR::StructMemberSeq &
 +    IR_StructMemberSeq &
    );
  
- #endif /* _TAO_CDR_OP_IR_StructMemberSeq_I_ */
- 
+-#endif /* _TAO_CDR_OP_IR_StructMemberSeq_I_ */
+-
 -ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::Initializer &_tao_aggregate)
 +ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_Initializer &_tao_aggregate)
  {
    if (
      (strm << _tao_aggregate.members) &&
-@@ -20782,7 +19645,7 @@
+@@ -20782,7 +19303,7 @@
    
  }
  
@@ -25345,31 +25311,33 @@
  {
    if (
      (strm >> _tao_aggregate.members) &&
-@@ -20798,18 +19661,18 @@
- #if !defined _TAO_CDR_OP_IR_InitializerSeq_I_
- #define _TAO_CDR_OP_IR_InitializerSeq_I_
+@@ -20794,22 +19315,16 @@
+   
+ }
  
--CORBA::Boolean TAO_Export operator<< (
-+CORBA::Boolean  operator<< (
+-
+-#if !defined _TAO_CDR_OP_IR_InitializerSeq_I_
+-#define _TAO_CDR_OP_IR_InitializerSeq_I_
+-
+ CORBA::Boolean TAO_Export operator<< (
      TAO_OutputCDR &,
 -    const IR::InitializerSeq &
 +    const IR_InitializerSeq &
    );
--CORBA::Boolean TAO_Export operator>> (
-+CORBA::Boolean  operator>> (
+ CORBA::Boolean TAO_Export operator>> (
      TAO_InputCDR &,
 -    IR::InitializerSeq &
 +    IR_InitializerSeq &
    );
  
- #endif /* _TAO_CDR_OP_IR_InitializerSeq_I_ */
- 
+-#endif /* _TAO_CDR_OP_IR_InitializerSeq_I_ */
+-
 -ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::UnionMember &_tao_aggregate)
 +ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_UnionMember &_tao_aggregate)
  {
    if (
      (strm << _tao_aggregate.name.in ()) &&
-@@ -20823,7 +19686,7 @@
+@@ -20823,7 +19338,7 @@
    
  }
  
@@ -25378,54 +25346,53 @@
  {
    if (
      (strm >> _tao_aggregate.name.out ()) &&
-@@ -20841,13 +19704,13 @@
- #if !defined _TAO_CDR_OP_IR_UnionMemberSeq_I_
- #define _TAO_CDR_OP_IR_UnionMemberSeq_I_
+@@ -20837,48 +19352,25 @@
+   
+ }
  
--CORBA::Boolean TAO_Export operator<< (
-+CORBA::Boolean  operator<< (
+-
+-#if !defined _TAO_CDR_OP_IR_UnionMemberSeq_I_
+-#define _TAO_CDR_OP_IR_UnionMemberSeq_I_
+-
+ CORBA::Boolean TAO_Export operator<< (
      TAO_OutputCDR &,
 -    const IR::UnionMemberSeq &
 +    const IR_UnionMemberSeq &
    );
--CORBA::Boolean TAO_Export operator>> (
-+CORBA::Boolean  operator>> (
+ CORBA::Boolean TAO_Export operator>> (
      TAO_InputCDR &,
 -    IR::UnionMemberSeq &
 +    IR_UnionMemberSeq &
    );
  
- #endif /* _TAO_CDR_OP_IR_UnionMemberSeq_I_ */
-@@ -20856,13 +19719,13 @@
- #if !defined _TAO_CDR_OP_IR_EnumMemberSeq_I_
- #define _TAO_CDR_OP_IR_EnumMemberSeq_I_
- 
--CORBA::Boolean TAO_Export operator<< (
-+CORBA::Boolean  operator<< (
+-#endif /* _TAO_CDR_OP_IR_UnionMemberSeq_I_ */
+-
+-
+-#if !defined _TAO_CDR_OP_IR_EnumMemberSeq_I_
+-#define _TAO_CDR_OP_IR_EnumMemberSeq_I_
+-
+ CORBA::Boolean TAO_Export operator<< (
      TAO_OutputCDR &,
 -    const IR::EnumMemberSeq &
 +    const IR_EnumMemberSeq &
    );
--CORBA::Boolean TAO_Export operator>> (
-+CORBA::Boolean  operator>> (
+ CORBA::Boolean TAO_Export operator>> (
      TAO_InputCDR &,
 -    IR::EnumMemberSeq &
-+    IR_EnumMemberSeq &
-   );
- 
- #endif /* _TAO_CDR_OP_IR_EnumMemberSeq_I_ */
-@@ -20870,15 +19733,15 @@
- ACE_INLINE CORBA::Boolean
- operator<< (
-     TAO_OutputCDR &,
+-  );
+-
+-#endif /* _TAO_CDR_OP_IR_EnumMemberSeq_I_ */
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
+-    TAO_OutputCDR &,
 -    const IR::Container_ptr
-+    const IR_Container_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::Container_ptr &
-+    IR_Container_ptr &
++    IR_EnumMemberSeq &
    );
  
 -ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::Container::Description &_tao_aggregate)
@@ -25433,7 +25400,7 @@
  {
    if (
      (strm << _tao_aggregate.contained_object.in ()) &&
-@@ -20891,7 +19754,7 @@
+@@ -20891,7 +19383,7 @@
    
  }
  
@@ -25442,25 +25409,27 @@
  {
    if (
      (strm >> _tao_aggregate.contained_object.out ()) &&
-@@ -20908,13 +19771,13 @@
- #if !defined _TAO_CDR_OP_IR_Container_DescriptionSeq_I_
- #define _TAO_CDR_OP_IR_Container_DescriptionSeq_I_
+@@ -20904,25 +19396,19 @@
+   
+ }
  
--CORBA::Boolean TAO_Export operator<< (
-+CORBA::Boolean  operator<< (
+-
+-#if !defined _TAO_CDR_OP_IR_Container_DescriptionSeq_I_
+-#define _TAO_CDR_OP_IR_Container_DescriptionSeq_I_
+-
+ CORBA::Boolean TAO_Export operator<< (
      TAO_OutputCDR &,
 -    const IR::Container::DescriptionSeq &
 +    const IR_Container::DescriptionSeq &
    );
--CORBA::Boolean TAO_Export operator>> (
-+CORBA::Boolean  operator>> (
+ CORBA::Boolean TAO_Export operator>> (
      TAO_InputCDR &,
 -    IR::Container::DescriptionSeq &
 +    IR_Container::DescriptionSeq &
    );
  
- #endif /* _TAO_CDR_OP_IR_Container_DescriptionSeq_I_ */
-@@ -20922,7 +19785,7 @@
+-#endif /* _TAO_CDR_OP_IR_Container_DescriptionSeq_I_ */
+-
  ACE_INLINE CORBA::Boolean
  operator<< (
      TAO_OutputCDR &strm,
@@ -25469,7 +25438,7 @@
    )
  {
    CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -20932,7 +19795,7 @@
+@@ -20932,7 +19418,7 @@
  ACE_INLINE CORBA::Boolean
  operator>> (
      TAO_InputCDR &strm,
@@ -25478,7 +25447,7 @@
    )
  {
    ACE_TRY_NEW_ENV
-@@ -20942,7 +19805,7 @@
+@@ -20942,7 +19428,7 @@
        return 0;
      // narrow to the right type
      _tao_objref =
@@ -25487,29 +25456,28 @@
            obj.in (),
            ACE_TRY_ENV
          );
-@@ -20960,18 +19823,18 @@
+@@ -20959,19 +19445,8 @@
+ 
  ACE_INLINE CORBA::Boolean
  operator<< (
-     TAO_OutputCDR &,
+-    TAO_OutputCDR &,
 -    const IR::IDLType_ptr
-+    const IR_IDLType_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::IDLType_ptr &
-+    IR_IDLType_ptr &
-   );
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
+-  );
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
      TAO_OutputCDR &strm,
 -    const IR::IDLType_ptr _tao_objref
 +    const IR_IDLType_ptr _tao_objref
    )
  {
    CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -20981,7 +19844,7 @@
+@@ -20981,7 +19456,7 @@
  ACE_INLINE CORBA::Boolean
  operator>> (
      TAO_InputCDR &strm,
@@ -25518,7 +25486,7 @@
    )
  {
    ACE_TRY_NEW_ENV
-@@ -20991,7 +19854,7 @@
+@@ -20991,7 +19466,7 @@
        return 0;
      // narrow to the right type
      _tao_objref =
@@ -25527,79 +25495,70 @@
            obj.in (),
            ACE_TRY_ENV
          );
-@@ -21009,77 +19872,77 @@
- ACE_INLINE CORBA::Boolean
- operator<< (
-     TAO_OutputCDR &,
+@@ -21006,80 +19481,20 @@
+   return 0;
+ }
+ 
+-ACE_INLINE CORBA::Boolean
+-operator<< (
+-    TAO_OutputCDR &,
 -    const IR::PrimitiveDef_ptr
-+    const IR_PrimitiveDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::PrimitiveDef_ptr &
-+    IR_PrimitiveDef_ptr &
-   );
- ACE_INLINE CORBA::Boolean
- operator<< (
-     TAO_OutputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator<< (
+-    TAO_OutputCDR &,
 -    const IR::StringDef_ptr
-+    const IR_StringDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::StringDef_ptr &
-+    IR_StringDef_ptr &
-   );
- ACE_INLINE CORBA::Boolean
- operator<< (
-     TAO_OutputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator<< (
+-    TAO_OutputCDR &,
 -    const IR::SequenceDef_ptr
-+    const IR_SequenceDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::SequenceDef_ptr &
-+    IR_SequenceDef_ptr &
-   );
- ACE_INLINE CORBA::Boolean
- operator<< (
-     TAO_OutputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator<< (
+-    TAO_OutputCDR &,
 -    const IR::ArrayDef_ptr
-+    const IR_ArrayDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::ArrayDef_ptr &
-+    IR_ArrayDef_ptr &
-   );
- ACE_INLINE CORBA::Boolean
- operator<< (
-     TAO_OutputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator<< (
+-    TAO_OutputCDR &,
 -    const IR::WstringDef_ptr
-+    const IR_WstringDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::WstringDef_ptr &
-+    IR_WstringDef_ptr &
-   );
- ACE_INLINE CORBA::Boolean
- operator<< (
-     TAO_OutputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator<< (
+-    TAO_OutputCDR &,
 -    const IR::FixedDef_ptr
-+    const IR_FixedDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::FixedDef_ptr &
-+    IR_FixedDef_ptr &
-   );
+-  );
 -ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::PrimitiveKind &_tao_enumval)
 +ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_PrimitiveKind &_tao_enumval)
  {
@@ -25620,29 +25579,28 @@
      }
    
    return _tao_result;
-@@ -21088,18 +19951,18 @@
+@@ -21087,19 +19502,8 @@
+ 
  ACE_INLINE CORBA::Boolean
  operator<< (
-     TAO_OutputCDR &,
+-    TAO_OutputCDR &,
 -    const IR::Repository_ptr
-+    const IR_Repository_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::Repository_ptr &
-+    IR_Repository_ptr &
-   );
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
+-  );
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
      TAO_OutputCDR &strm,
 -    const IR::Repository_ptr _tao_objref
 +    const IR_Repository_ptr _tao_objref
    )
  {
    CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -21109,7 +19972,7 @@
+@@ -21109,7 +19513,7 @@
  ACE_INLINE CORBA::Boolean
  operator>> (
      TAO_InputCDR &strm,
@@ -25651,7 +25609,7 @@
    )
  {
    ACE_TRY_NEW_ENV
-@@ -21119,7 +19982,7 @@
+@@ -21119,7 +19523,7 @@
        return 0;
      // narrow to the right type
      _tao_objref =
@@ -25660,29 +25618,28 @@
            obj.in (),
            ACE_TRY_ENV
          );
-@@ -21137,18 +20000,18 @@
+@@ -21136,19 +19540,8 @@
+ 
  ACE_INLINE CORBA::Boolean
  operator<< (
-     TAO_OutputCDR &,
+-    TAO_OutputCDR &,
 -    const IR::ComponentRepository_ptr
-+    const IR_ComponentRepository_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::ComponentRepository_ptr &
-+    IR_ComponentRepository_ptr &
-   );
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
+-  );
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
      TAO_OutputCDR &strm,
 -    const IR::ComponentRepository_ptr _tao_objref
 +    const IR_ComponentRepository_ptr _tao_objref
    )
  {
    CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -21158,7 +20021,7 @@
+@@ -21158,7 +19551,7 @@
  ACE_INLINE CORBA::Boolean
  operator>> (
      TAO_InputCDR &strm,
@@ -25691,7 +25648,7 @@
    )
  {
    ACE_TRY_NEW_ENV
-@@ -21168,7 +20031,7 @@
+@@ -21168,7 +19561,7 @@
        return 0;
      // narrow to the right type
      _tao_objref =
@@ -25700,29 +25657,28 @@
            obj.in (),
            ACE_TRY_ENV
          );
-@@ -21186,18 +20049,18 @@
+@@ -21185,19 +19578,8 @@
+ 
  ACE_INLINE CORBA::Boolean
  operator<< (
-     TAO_OutputCDR &,
+-    TAO_OutputCDR &,
 -    const IR::ModuleDef_ptr
-+    const IR_ModuleDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::ModuleDef_ptr &
-+    IR_ModuleDef_ptr &
-   );
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
+-  );
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
      TAO_OutputCDR &strm,
 -    const IR::ModuleDef_ptr _tao_objref
 +    const IR_ModuleDef_ptr _tao_objref
    )
  {
    CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -21207,7 +20070,7 @@
+@@ -21207,7 +19589,7 @@
  ACE_INLINE CORBA::Boolean
  operator>> (
      TAO_InputCDR &strm,
@@ -25731,7 +25687,7 @@
    )
  {
    ACE_TRY_NEW_ENV
-@@ -21217,7 +20080,7 @@
+@@ -21217,7 +19599,7 @@
        return 0;
      // narrow to the right type
      _tao_objref =
@@ -25740,7 +25696,7 @@
            obj.in (),
            ACE_TRY_ENV
          );
-@@ -21232,7 +20095,7 @@
+@@ -21232,7 +19614,7 @@
    return 0;
  }
  
@@ -25749,7 +25705,7 @@
  {
    if (
      (strm << _tao_aggregate.name.in ()) &&
-@@ -21246,7 +20109,7 @@
+@@ -21246,7 +19628,7 @@
    
  }
  
@@ -25758,29 +25714,28 @@
  {
    if (
      (strm >> _tao_aggregate.name.out ()) &&
-@@ -21263,18 +20126,18 @@
+@@ -21262,19 +19644,8 @@
+ 
  ACE_INLINE CORBA::Boolean
  operator<< (
-     TAO_OutputCDR &,
+-    TAO_OutputCDR &,
 -    const IR::ConstantDef_ptr
-+    const IR_ConstantDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::ConstantDef_ptr &
-+    IR_ConstantDef_ptr &
-   );
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
+-  );
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
      TAO_OutputCDR &strm,
 -    const IR::ConstantDef_ptr _tao_objref
 +    const IR_ConstantDef_ptr _tao_objref
    )
  {
    CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -21284,7 +20147,7 @@
+@@ -21284,7 +19655,7 @@
  ACE_INLINE CORBA::Boolean
  operator>> (
      TAO_InputCDR &strm,
@@ -25789,7 +25744,7 @@
    )
  {
    ACE_TRY_NEW_ENV
-@@ -21294,7 +20157,7 @@
+@@ -21294,7 +19665,7 @@
        return 0;
      // narrow to the right type
      _tao_objref =
@@ -25798,7 +25753,7 @@
            obj.in (),
            ACE_TRY_ENV
          );
-@@ -21309,7 +20172,7 @@
+@@ -21309,7 +19680,7 @@
    return 0;
  }
  
@@ -25807,7 +25762,7 @@
  {
    if (
      (strm << _tao_aggregate.name.in ()) &&
-@@ -21325,7 +20188,7 @@
+@@ -21325,7 +19696,7 @@
    
  }
  
@@ -25816,29 +25771,28 @@
  {
    if (
      (strm >> _tao_aggregate.name.out ()) &&
-@@ -21344,18 +20207,18 @@
+@@ -21343,19 +19714,8 @@
+ 
  ACE_INLINE CORBA::Boolean
  operator<< (
-     TAO_OutputCDR &,
+-    TAO_OutputCDR &,
 -    const IR::TypedefDef_ptr
-+    const IR_TypedefDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::TypedefDef_ptr &
-+    IR_TypedefDef_ptr &
-   );
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
+-  );
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
      TAO_OutputCDR &strm,
 -    const IR::TypedefDef_ptr _tao_objref
 +    const IR_TypedefDef_ptr _tao_objref
    )
  {
    CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -21365,7 +20228,7 @@
+@@ -21365,7 +19725,7 @@
  ACE_INLINE CORBA::Boolean
  operator>> (
      TAO_InputCDR &strm,
@@ -25847,7 +25801,7 @@
    )
  {
    ACE_TRY_NEW_ENV
-@@ -21375,7 +20238,7 @@
+@@ -21375,7 +19735,7 @@
        return 0;
      // narrow to the right type
      _tao_objref =
@@ -25856,7 +25810,7 @@
            obj.in (),
            ACE_TRY_ENV
          );
-@@ -21390,7 +20253,7 @@
+@@ -21390,7 +19750,7 @@
    return 0;
  }
  
@@ -25865,7 +25819,7 @@
  {
    if (
      (strm << _tao_aggregate.name.in ()) &&
-@@ -21405,7 +20268,7 @@
+@@ -21405,7 +19765,7 @@
    
  }
  
@@ -25874,29 +25828,28 @@
  {
    if (
      (strm >> _tao_aggregate.name.out ()) &&
-@@ -21423,18 +20286,18 @@
+@@ -21422,19 +19782,8 @@
+ 
  ACE_INLINE CORBA::Boolean
  operator<< (
-     TAO_OutputCDR &,
+-    TAO_OutputCDR &,
 -    const IR::StructDef_ptr
-+    const IR_StructDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::StructDef_ptr &
-+    IR_StructDef_ptr &
-   );
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
+-  );
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
      TAO_OutputCDR &strm,
 -    const IR::StructDef_ptr _tao_objref
 +    const IR_StructDef_ptr _tao_objref
    )
  {
    CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -21444,7 +20307,7 @@
+@@ -21444,7 +19793,7 @@
  ACE_INLINE CORBA::Boolean
  operator>> (
      TAO_InputCDR &strm,
@@ -25905,7 +25858,7 @@
    )
  {
    ACE_TRY_NEW_ENV
-@@ -21454,7 +20317,7 @@
+@@ -21454,7 +19803,7 @@
        return 0;
      // narrow to the right type
      _tao_objref =
@@ -25914,29 +25867,28 @@
            obj.in (),
            ACE_TRY_ENV
          );
-@@ -21472,18 +20335,18 @@
+@@ -21471,19 +19820,8 @@
+ 
  ACE_INLINE CORBA::Boolean
  operator<< (
-     TAO_OutputCDR &,
+-    TAO_OutputCDR &,
 -    const IR::UnionDef_ptr
-+    const IR_UnionDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::UnionDef_ptr &
-+    IR_UnionDef_ptr &
-   );
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
+-  );
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
      TAO_OutputCDR &strm,
 -    const IR::UnionDef_ptr _tao_objref
 +    const IR_UnionDef_ptr _tao_objref
    )
  {
    CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -21493,7 +20356,7 @@
+@@ -21493,7 +19831,7 @@
  ACE_INLINE CORBA::Boolean
  operator>> (
      TAO_InputCDR &strm,
@@ -25945,7 +25897,7 @@
    )
  {
    ACE_TRY_NEW_ENV
-@@ -21503,7 +20366,7 @@
+@@ -21503,7 +19841,7 @@
        return 0;
      // narrow to the right type
      _tao_objref =
@@ -25954,29 +25906,28 @@
            obj.in (),
            ACE_TRY_ENV
          );
-@@ -21521,18 +20384,18 @@
+@@ -21520,19 +19858,8 @@
+ 
  ACE_INLINE CORBA::Boolean
  operator<< (
-     TAO_OutputCDR &,
+-    TAO_OutputCDR &,
 -    const IR::EnumDef_ptr
-+    const IR_EnumDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::EnumDef_ptr &
-+    IR_EnumDef_ptr &
-   );
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
+-  );
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
      TAO_OutputCDR &strm,
 -    const IR::EnumDef_ptr _tao_objref
 +    const IR_EnumDef_ptr _tao_objref
    )
  {
    CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -21542,7 +20405,7 @@
+@@ -21542,7 +19869,7 @@
  ACE_INLINE CORBA::Boolean
  operator>> (
      TAO_InputCDR &strm,
@@ -25985,7 +25936,7 @@
    )
  {
    ACE_TRY_NEW_ENV
-@@ -21552,7 +20415,7 @@
+@@ -21552,7 +19879,7 @@
        return 0;
      // narrow to the right type
      _tao_objref =
@@ -25994,19 +25945,23 @@
            obj.in (),
            ACE_TRY_ENV
          );
-@@ -21570,18 +20433,18 @@
- ACE_INLINE CORBA::Boolean
- operator<< (
-     TAO_OutputCDR &,
+@@ -21565,23 +19892,12 @@
+   }
+   ACE_ENDTRY;
+   return 0;
+-}
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
+-    TAO_OutputCDR &,
 -    const IR::AliasDef_ptr
-+    const IR_AliasDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::AliasDef_ptr &
-+    IR_AliasDef_ptr &
-   );
+-  );
++}
  
  ACE_INLINE CORBA::Boolean
  operator<< (
@@ -26016,7 +25971,7 @@
    )
  {
    CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -21591,7 +20454,7 @@
+@@ -21591,7 +19907,7 @@
  ACE_INLINE CORBA::Boolean
  operator>> (
      TAO_InputCDR &strm,
@@ -26025,7 +25980,7 @@
    )
  {
    ACE_TRY_NEW_ENV
-@@ -21601,7 +20464,7 @@
+@@ -21601,7 +19917,7 @@
        return 0;
      // narrow to the right type
      _tao_objref =
@@ -26034,29 +25989,28 @@
            obj.in (),
            ACE_TRY_ENV
          );
-@@ -21619,18 +20482,18 @@
+@@ -21618,19 +19934,8 @@
+ 
  ACE_INLINE CORBA::Boolean
  operator<< (
-     TAO_OutputCDR &,
+-    TAO_OutputCDR &,
 -    const IR::NativeDef_ptr
-+    const IR_NativeDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::NativeDef_ptr &
-+    IR_NativeDef_ptr &
-   );
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
+-  );
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
      TAO_OutputCDR &strm,
 -    const IR::NativeDef_ptr _tao_objref
 +    const IR_NativeDef_ptr _tao_objref
    )
  {
    CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -21640,7 +20503,7 @@
+@@ -21640,7 +19945,7 @@
  ACE_INLINE CORBA::Boolean
  operator>> (
      TAO_InputCDR &strm,
@@ -26065,7 +26019,7 @@
    )
  {
    ACE_TRY_NEW_ENV
-@@ -21650,7 +20513,7 @@
+@@ -21650,7 +19955,7 @@
        return 0;
      // narrow to the right type
      _tao_objref =
@@ -26074,29 +26028,28 @@
            obj.in (),
            ACE_TRY_ENV
          );
-@@ -21668,18 +20531,18 @@
+@@ -21667,19 +19972,8 @@
+ 
  ACE_INLINE CORBA::Boolean
  operator<< (
-     TAO_OutputCDR &,
+-    TAO_OutputCDR &,
 -    const IR::PrimitiveDef_ptr
-+    const IR_PrimitiveDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::PrimitiveDef_ptr &
-+    IR_PrimitiveDef_ptr &
-   );
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
+-  );
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
      TAO_OutputCDR &strm,
 -    const IR::PrimitiveDef_ptr _tao_objref
 +    const IR_PrimitiveDef_ptr _tao_objref
    )
  {
    CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -21689,7 +20552,7 @@
+@@ -21689,7 +19983,7 @@
  ACE_INLINE CORBA::Boolean
  operator>> (
      TAO_InputCDR &strm,
@@ -26105,7 +26058,7 @@
    )
  {
    ACE_TRY_NEW_ENV
-@@ -21699,7 +20562,7 @@
+@@ -21699,7 +19993,7 @@
        return 0;
      // narrow to the right type
      _tao_objref =
@@ -26114,29 +26067,28 @@
            obj.in (),
            ACE_TRY_ENV
          );
-@@ -21717,18 +20580,18 @@
+@@ -21716,19 +20010,8 @@
+ 
  ACE_INLINE CORBA::Boolean
  operator<< (
-     TAO_OutputCDR &,
+-    TAO_OutputCDR &,
 -    const IR::StringDef_ptr
-+    const IR_StringDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::StringDef_ptr &
-+    IR_StringDef_ptr &
-   );
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
+-  );
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
      TAO_OutputCDR &strm,
 -    const IR::StringDef_ptr _tao_objref
 +    const IR_StringDef_ptr _tao_objref
    )
  {
    CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -21738,7 +20601,7 @@
+@@ -21738,7 +20021,7 @@
  ACE_INLINE CORBA::Boolean
  operator>> (
      TAO_InputCDR &strm,
@@ -26145,7 +26097,7 @@
    )
  {
    ACE_TRY_NEW_ENV
-@@ -21748,7 +20611,7 @@
+@@ -21748,7 +20031,7 @@
        return 0;
      // narrow to the right type
      _tao_objref =
@@ -26154,29 +26106,28 @@
            obj.in (),
            ACE_TRY_ENV
          );
-@@ -21766,18 +20629,18 @@
+@@ -21765,19 +20048,8 @@
+ 
  ACE_INLINE CORBA::Boolean
  operator<< (
-     TAO_OutputCDR &,
+-    TAO_OutputCDR &,
 -    const IR::WstringDef_ptr
-+    const IR_WstringDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::WstringDef_ptr &
-+    IR_WstringDef_ptr &
-   );
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
+-  );
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
      TAO_OutputCDR &strm,
 -    const IR::WstringDef_ptr _tao_objref
 +    const IR_WstringDef_ptr _tao_objref
    )
  {
    CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -21787,7 +20650,7 @@
+@@ -21787,7 +20059,7 @@
  ACE_INLINE CORBA::Boolean
  operator>> (
      TAO_InputCDR &strm,
@@ -26185,7 +26136,7 @@
    )
  {
    ACE_TRY_NEW_ENV
-@@ -21797,7 +20660,7 @@
+@@ -21797,7 +20069,7 @@
        return 0;
      // narrow to the right type
      _tao_objref =
@@ -26194,29 +26145,28 @@
            obj.in (),
            ACE_TRY_ENV
          );
-@@ -21815,18 +20678,18 @@
+@@ -21814,19 +20086,8 @@
+ 
  ACE_INLINE CORBA::Boolean
  operator<< (
-     TAO_OutputCDR &,
+-    TAO_OutputCDR &,
 -    const IR::FixedDef_ptr
-+    const IR_FixedDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::FixedDef_ptr &
-+    IR_FixedDef_ptr &
-   );
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
+-  );
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
      TAO_OutputCDR &strm,
 -    const IR::FixedDef_ptr _tao_objref
 +    const IR_FixedDef_ptr _tao_objref
    )
  {
    CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -21836,7 +20699,7 @@
+@@ -21836,7 +20097,7 @@
  ACE_INLINE CORBA::Boolean
  operator>> (
      TAO_InputCDR &strm,
@@ -26225,7 +26175,7 @@
    )
  {
    ACE_TRY_NEW_ENV
-@@ -21846,7 +20709,7 @@
+@@ -21846,7 +20107,7 @@
        return 0;
      // narrow to the right type
      _tao_objref =
@@ -26234,29 +26184,28 @@
            obj.in (),
            ACE_TRY_ENV
          );
-@@ -21864,18 +20727,18 @@
+@@ -21863,19 +20124,8 @@
+ 
  ACE_INLINE CORBA::Boolean
  operator<< (
-     TAO_OutputCDR &,
+-    TAO_OutputCDR &,
 -    const IR::SequenceDef_ptr
-+    const IR_SequenceDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::SequenceDef_ptr &
-+    IR_SequenceDef_ptr &
-   );
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
+-  );
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
      TAO_OutputCDR &strm,
 -    const IR::SequenceDef_ptr _tao_objref
 +    const IR_SequenceDef_ptr _tao_objref
    )
  {
    CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -21885,7 +20748,7 @@
+@@ -21885,7 +20135,7 @@
  ACE_INLINE CORBA::Boolean
  operator>> (
      TAO_InputCDR &strm,
@@ -26265,7 +26214,7 @@
    )
  {
    ACE_TRY_NEW_ENV
-@@ -21895,7 +20758,7 @@
+@@ -21895,7 +20145,7 @@
        return 0;
      // narrow to the right type
      _tao_objref =
@@ -26274,29 +26223,28 @@
            obj.in (),
            ACE_TRY_ENV
          );
-@@ -21913,18 +20776,18 @@
+@@ -21912,19 +20162,8 @@
+ 
  ACE_INLINE CORBA::Boolean
  operator<< (
-     TAO_OutputCDR &,
+-    TAO_OutputCDR &,
 -    const IR::ArrayDef_ptr
-+    const IR_ArrayDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::ArrayDef_ptr &
-+    IR_ArrayDef_ptr &
-   );
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
+-  );
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
      TAO_OutputCDR &strm,
 -    const IR::ArrayDef_ptr _tao_objref
 +    const IR_ArrayDef_ptr _tao_objref
    )
  {
    CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -21934,7 +20797,7 @@
+@@ -21934,7 +20173,7 @@
  ACE_INLINE CORBA::Boolean
  operator>> (
      TAO_InputCDR &strm,
@@ -26305,7 +26253,7 @@
    )
  {
    ACE_TRY_NEW_ENV
-@@ -21944,7 +20807,7 @@
+@@ -21944,7 +20183,7 @@
        return 0;
      // narrow to the right type
      _tao_objref =
@@ -26314,29 +26262,28 @@
            obj.in (),
            ACE_TRY_ENV
          );
-@@ -21962,18 +20825,18 @@
+@@ -21961,19 +20200,8 @@
+ 
  ACE_INLINE CORBA::Boolean
  operator<< (
-     TAO_OutputCDR &,
+-    TAO_OutputCDR &,
 -    const IR::ExceptionDef_ptr
-+    const IR_ExceptionDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::ExceptionDef_ptr &
-+    IR_ExceptionDef_ptr &
-   );
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
+-  );
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
      TAO_OutputCDR &strm,
 -    const IR::ExceptionDef_ptr _tao_objref
 +    const IR_ExceptionDef_ptr _tao_objref
    )
  {
    CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -21983,7 +20846,7 @@
+@@ -21983,7 +20211,7 @@
  ACE_INLINE CORBA::Boolean
  operator>> (
      TAO_InputCDR &strm,
@@ -26345,7 +26292,7 @@
    )
  {
    ACE_TRY_NEW_ENV
-@@ -21993,7 +20856,7 @@
+@@ -21993,7 +20221,7 @@
        return 0;
      // narrow to the right type
      _tao_objref =
@@ -26354,7 +26301,7 @@
            obj.in (),
            ACE_TRY_ENV
          );
-@@ -22008,7 +20871,7 @@
+@@ -22008,7 +20236,7 @@
    return 0;
  }
  
@@ -26363,7 +26310,7 @@
  {
    if (
      (strm << _tao_aggregate.name.in ()) &&
-@@ -22023,7 +20886,7 @@
+@@ -22023,7 +20251,7 @@
    
  }
  
@@ -26372,43 +26319,44 @@
  {
    if (
      (strm >> _tao_aggregate.name.out ()) &&
-@@ -22042,13 +20905,13 @@
- #if !defined _TAO_CDR_OP_IR_ExceptionDefSeq_I_
- #define _TAO_CDR_OP_IR_ExceptionDefSeq_I_
+@@ -22038,50 +20266,38 @@
+   
+ }
  
--CORBA::Boolean TAO_Export operator<< (
-+CORBA::Boolean  operator<< (
+-
+-#if !defined _TAO_CDR_OP_IR_ExceptionDefSeq_I_
+-#define _TAO_CDR_OP_IR_ExceptionDefSeq_I_
+-
+ CORBA::Boolean TAO_Export operator<< (
      TAO_OutputCDR &,
 -    const IR::ExceptionDefSeq &
 +    const IR_ExceptionDefSeq &
    );
--CORBA::Boolean TAO_Export operator>> (
-+CORBA::Boolean  operator>> (
+ CORBA::Boolean TAO_Export operator>> (
      TAO_InputCDR &,
 -    IR::ExceptionDefSeq &
 +    IR_ExceptionDefSeq &
    );
  
- #endif /* _TAO_CDR_OP_IR_ExceptionDefSeq_I_ */
-@@ -22057,31 +20920,31 @@
- #if !defined _TAO_CDR_OP_IR_ExcDescriptionSeq_I_
- #define _TAO_CDR_OP_IR_ExcDescriptionSeq_I_
- 
--CORBA::Boolean TAO_Export operator<< (
-+CORBA::Boolean  operator<< (
+-#endif /* _TAO_CDR_OP_IR_ExceptionDefSeq_I_ */
+-
+-
+-#if !defined _TAO_CDR_OP_IR_ExcDescriptionSeq_I_
+-#define _TAO_CDR_OP_IR_ExcDescriptionSeq_I_
+-
+ CORBA::Boolean TAO_Export operator<< (
      TAO_OutputCDR &,
 -    const IR::ExcDescriptionSeq &
 +    const IR_ExcDescriptionSeq &
    );
--CORBA::Boolean TAO_Export operator>> (
-+CORBA::Boolean  operator>> (
+ CORBA::Boolean TAO_Export operator>> (
      TAO_InputCDR &,
 -    IR::ExcDescriptionSeq &
 +    IR_ExcDescriptionSeq &
    );
  
- #endif /* _TAO_CDR_OP_IR_ExcDescriptionSeq_I_ */
- 
+-#endif /* _TAO_CDR_OP_IR_ExcDescriptionSeq_I_ */
+-
 -ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::AttributeMode &_tao_enumval)
 +ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_AttributeMode &_tao_enumval)
  {
@@ -26429,29 +26377,28 @@
      }
    
    return _tao_result;
-@@ -22090,18 +20953,18 @@
+@@ -22089,19 +20305,8 @@
+ 
  ACE_INLINE CORBA::Boolean
  operator<< (
-     TAO_OutputCDR &,
+-    TAO_OutputCDR &,
 -    const IR::AttributeDef_ptr
-+    const IR_AttributeDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::AttributeDef_ptr &
-+    IR_AttributeDef_ptr &
-   );
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
+-  );
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
      TAO_OutputCDR &strm,
 -    const IR::AttributeDef_ptr _tao_objref
 +    const IR_AttributeDef_ptr _tao_objref
    )
  {
    CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -22111,7 +20974,7 @@
+@@ -22111,7 +20316,7 @@
  ACE_INLINE CORBA::Boolean
  operator>> (
      TAO_InputCDR &strm,
@@ -26460,7 +26407,7 @@
    )
  {
    ACE_TRY_NEW_ENV
-@@ -22121,7 +20984,7 @@
+@@ -22121,7 +20326,7 @@
        return 0;
      // narrow to the right type
      _tao_objref =
@@ -26469,7 +26416,7 @@
            obj.in (),
            ACE_TRY_ENV
          );
-@@ -22136,7 +20999,7 @@
+@@ -22136,7 +20341,7 @@
    return 0;
  }
  
@@ -26478,7 +26425,7 @@
  {
    if (
      (strm << _tao_aggregate.name.in ()) &&
-@@ -22154,7 +21017,7 @@
+@@ -22154,7 +20359,7 @@
    
  }
  
@@ -26487,7 +26434,7 @@
  {
    if (
      (strm >> _tao_aggregate.name.out ()) &&
-@@ -22172,45 +21035,45 @@
+@@ -22172,45 +20377,45 @@
    
  }
  
@@ -26540,7 +26487,7 @@
  {
    if (
      (strm << _tao_aggregate.name.in ()) &&
-@@ -22224,7 +21087,7 @@
+@@ -22224,7 +20429,7 @@
    
  }
  
@@ -26549,54 +26496,53 @@
  {
    if (
      (strm >> _tao_aggregate.name.out ()) &&
-@@ -22242,13 +21105,13 @@
- #if !defined _TAO_CDR_OP_IR_ParDescriptionSeq_I_
- #define _TAO_CDR_OP_IR_ParDescriptionSeq_I_
+@@ -22238,51 +20443,28 @@
+   
+ }
  
--CORBA::Boolean TAO_Export operator<< (
-+CORBA::Boolean  operator<< (
+-
+-#if !defined _TAO_CDR_OP_IR_ParDescriptionSeq_I_
+-#define _TAO_CDR_OP_IR_ParDescriptionSeq_I_
+-
+ CORBA::Boolean TAO_Export operator<< (
      TAO_OutputCDR &,
 -    const IR::ParDescriptionSeq &
 +    const IR_ParDescriptionSeq &
    );
--CORBA::Boolean TAO_Export operator>> (
-+CORBA::Boolean  operator>> (
+ CORBA::Boolean TAO_Export operator>> (
      TAO_InputCDR &,
 -    IR::ParDescriptionSeq &
 +    IR_ParDescriptionSeq &
    );
  
- #endif /* _TAO_CDR_OP_IR_ParDescriptionSeq_I_ */
-@@ -22257,13 +21120,13 @@
- #if !defined _TAO_CDR_OP_IR_ContextIdSeq_I_
- #define _TAO_CDR_OP_IR_ContextIdSeq_I_
- 
--CORBA::Boolean TAO_Export operator<< (
-+CORBA::Boolean  operator<< (
+-#endif /* _TAO_CDR_OP_IR_ParDescriptionSeq_I_ */
+-
+-
+-#if !defined _TAO_CDR_OP_IR_ContextIdSeq_I_
+-#define _TAO_CDR_OP_IR_ContextIdSeq_I_
+-
+ CORBA::Boolean TAO_Export operator<< (
      TAO_OutputCDR &,
 -    const IR::ContextIdSeq &
 +    const IR_ContextIdSeq &
    );
--CORBA::Boolean TAO_Export operator>> (
-+CORBA::Boolean  operator>> (
+ CORBA::Boolean TAO_Export operator>> (
      TAO_InputCDR &,
 -    IR::ContextIdSeq &
-+    IR_ContextIdSeq &
-   );
- 
- #endif /* _TAO_CDR_OP_IR_ContextIdSeq_I_ */
-@@ -22271,18 +21134,18 @@
- ACE_INLINE CORBA::Boolean
- operator<< (
-     TAO_OutputCDR &,
+-  );
+-
+-#endif /* _TAO_CDR_OP_IR_ContextIdSeq_I_ */
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
+-    TAO_OutputCDR &,
 -    const IR::OperationDef_ptr
-+    const IR_OperationDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::OperationDef_ptr &
-+    IR_OperationDef_ptr &
++    IR_ContextIdSeq &
    );
  
  ACE_INLINE CORBA::Boolean
@@ -26607,7 +26553,7 @@
    )
  {
    CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -22292,7 +21155,7 @@
+@@ -22292,7 +20474,7 @@
  ACE_INLINE CORBA::Boolean
  operator>> (
      TAO_InputCDR &strm,
@@ -26616,7 +26562,7 @@
    )
  {
    ACE_TRY_NEW_ENV
-@@ -22302,7 +21165,7 @@
+@@ -22302,7 +20484,7 @@
        return 0;
      // narrow to the right type
      _tao_objref =
@@ -26625,7 +26571,7 @@
            obj.in (),
            ACE_TRY_ENV
          );
-@@ -22317,7 +21180,7 @@
+@@ -22317,7 +20499,7 @@
    return 0;
  }
  
@@ -26634,7 +26580,7 @@
  {
    if (
      (strm << _tao_aggregate.name.in ()) &&
-@@ -22336,7 +21199,7 @@
+@@ -22336,7 +20518,7 @@
    
  }
  
@@ -26643,72 +26589,70 @@
  {
    if (
      (strm >> _tao_aggregate.name.out ()) &&
-@@ -22359,13 +21222,13 @@
- #if !defined _TAO_CDR_OP_IR_RepositoryIdSeq_I_
- #define _TAO_CDR_OP_IR_RepositoryIdSeq_I_
+@@ -22355,66 +20537,37 @@
+   
+ }
  
--CORBA::Boolean TAO_Export operator<< (
-+CORBA::Boolean  operator<< (
+-
+-#if !defined _TAO_CDR_OP_IR_RepositoryIdSeq_I_
+-#define _TAO_CDR_OP_IR_RepositoryIdSeq_I_
+-
+ CORBA::Boolean TAO_Export operator<< (
      TAO_OutputCDR &,
 -    const IR::RepositoryIdSeq &
 +    const IR_RepositoryIdSeq &
    );
--CORBA::Boolean TAO_Export operator>> (
-+CORBA::Boolean  operator>> (
+ CORBA::Boolean TAO_Export operator>> (
      TAO_InputCDR &,
 -    IR::RepositoryIdSeq &
 +    IR_RepositoryIdSeq &
    );
  
- #endif /* _TAO_CDR_OP_IR_RepositoryIdSeq_I_ */
-@@ -22374,13 +21237,13 @@
- #if !defined _TAO_CDR_OP_IR_OpDescriptionSeq_I_
- #define _TAO_CDR_OP_IR_OpDescriptionSeq_I_
- 
--CORBA::Boolean TAO_Export operator<< (
-+CORBA::Boolean  operator<< (
+-#endif /* _TAO_CDR_OP_IR_RepositoryIdSeq_I_ */
+-
+-
+-#if !defined _TAO_CDR_OP_IR_OpDescriptionSeq_I_
+-#define _TAO_CDR_OP_IR_OpDescriptionSeq_I_
+-
+ CORBA::Boolean TAO_Export operator<< (
      TAO_OutputCDR &,
 -    const IR::OpDescriptionSeq &
 +    const IR_OpDescriptionSeq &
    );
--CORBA::Boolean TAO_Export operator>> (
-+CORBA::Boolean  operator>> (
+ CORBA::Boolean TAO_Export operator>> (
      TAO_InputCDR &,
 -    IR::OpDescriptionSeq &
 +    IR_OpDescriptionSeq &
    );
  
- #endif /* _TAO_CDR_OP_IR_OpDescriptionSeq_I_ */
-@@ -22389,13 +21252,13 @@
- #if !defined _TAO_CDR_OP_IR_AttrDescriptionSeq_I_
- #define _TAO_CDR_OP_IR_AttrDescriptionSeq_I_
- 
--CORBA::Boolean TAO_Export operator<< (
-+CORBA::Boolean  operator<< (
+-#endif /* _TAO_CDR_OP_IR_OpDescriptionSeq_I_ */
+-
+-
+-#if !defined _TAO_CDR_OP_IR_AttrDescriptionSeq_I_
+-#define _TAO_CDR_OP_IR_AttrDescriptionSeq_I_
+-
+ CORBA::Boolean TAO_Export operator<< (
      TAO_OutputCDR &,
 -    const IR::AttrDescriptionSeq &
 +    const IR_AttrDescriptionSeq &
    );
--CORBA::Boolean TAO_Export operator>> (
-+CORBA::Boolean  operator>> (
+ CORBA::Boolean TAO_Export operator>> (
      TAO_InputCDR &,
 -    IR::AttrDescriptionSeq &
-+    IR_AttrDescriptionSeq &
-   );
- 
- #endif /* _TAO_CDR_OP_IR_AttrDescriptionSeq_I_ */
-@@ -22403,18 +21266,18 @@
- ACE_INLINE CORBA::Boolean
- operator<< (
-     TAO_OutputCDR &,
+-  );
+-
+-#endif /* _TAO_CDR_OP_IR_AttrDescriptionSeq_I_ */
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
+-    TAO_OutputCDR &,
 -    const IR::InterfaceDef_ptr
-+    const IR_InterfaceDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::InterfaceDef_ptr &
-+    IR_InterfaceDef_ptr &
++    IR_AttrDescriptionSeq &
    );
  
  ACE_INLINE CORBA::Boolean
@@ -26719,7 +26663,7 @@
    )
  {
    CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -22424,7 +21287,7 @@
+@@ -22424,7 +20577,7 @@
  ACE_INLINE CORBA::Boolean
  operator>> (
      TAO_InputCDR &strm,
@@ -26728,7 +26672,7 @@
    )
  {
    ACE_TRY_NEW_ENV
-@@ -22434,7 +21297,7 @@
+@@ -22434,7 +20587,7 @@
        return 0;
      // narrow to the right type
      _tao_objref =
@@ -26737,7 +26681,7 @@
            obj.in (),
            ACE_TRY_ENV
          );
-@@ -22449,7 +21312,7 @@
+@@ -22449,7 +20602,7 @@
    return 0;
  }
  
@@ -26746,7 +26690,7 @@
  {
    if (
      (strm << _tao_aggregate.name.in ()) &&
-@@ -22469,7 +21332,7 @@
+@@ -22469,7 +20622,7 @@
    
  }
  
@@ -26755,7 +26699,7 @@
  {
    if (
      (strm >> _tao_aggregate.name.out ()) &&
-@@ -22489,7 +21352,7 @@
+@@ -22489,7 +20642,7 @@
    
  }
  
@@ -26764,7 +26708,7 @@
  {
    if (
      (strm << _tao_aggregate.name.in ()) &&
-@@ -22506,7 +21369,7 @@
+@@ -22506,7 +20659,7 @@
    
  }
  
@@ -26773,36 +26717,36 @@
  {
    if (
      (strm >> _tao_aggregate.name.out ()) &&
-@@ -22527,13 +21390,13 @@
- #if !defined _TAO_CDR_OP_IR_ValueMemberSeq_I_
- #define _TAO_CDR_OP_IR_ValueMemberSeq_I_
+@@ -22523,36 +20676,19 @@
+   
+ }
  
--CORBA::Boolean TAO_Export operator<< (
-+CORBA::Boolean  operator<< (
+-
+-#if !defined _TAO_CDR_OP_IR_ValueMemberSeq_I_
+-#define _TAO_CDR_OP_IR_ValueMemberSeq_I_
+-
+ CORBA::Boolean TAO_Export operator<< (
      TAO_OutputCDR &,
 -    const IR::ValueMemberSeq &
 +    const IR_ValueMemberSeq &
    );
--CORBA::Boolean TAO_Export operator>> (
-+CORBA::Boolean  operator>> (
+ CORBA::Boolean TAO_Export operator>> (
      TAO_InputCDR &,
 -    IR::ValueMemberSeq &
-+    IR_ValueMemberSeq &
-   );
- 
- #endif /* _TAO_CDR_OP_IR_ValueMemberSeq_I_ */
-@@ -22541,18 +21404,18 @@
- ACE_INLINE CORBA::Boolean
- operator<< (
-     TAO_OutputCDR &,
+-  );
+-
+-#endif /* _TAO_CDR_OP_IR_ValueMemberSeq_I_ */
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
+-    TAO_OutputCDR &,
 -    const IR::ValueMemberDef_ptr
-+    const IR_ValueMemberDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::ValueMemberDef_ptr &
-+    IR_ValueMemberDef_ptr &
++    IR_ValueMemberSeq &
    );
  
  ACE_INLINE CORBA::Boolean
@@ -26813,7 +26757,7 @@
    )
  {
    CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -22562,7 +21425,7 @@
+@@ -22562,7 +20698,7 @@
  ACE_INLINE CORBA::Boolean
  operator>> (
      TAO_InputCDR &strm,
@@ -26822,7 +26766,7 @@
    )
  {
    ACE_TRY_NEW_ENV
-@@ -22572,7 +21435,7 @@
+@@ -22572,7 +20708,7 @@
        return 0;
      // narrow to the right type
      _tao_objref =
@@ -26831,29 +26775,28 @@
            obj.in (),
            ACE_TRY_ENV
          );
-@@ -22590,18 +21453,18 @@
+@@ -22589,19 +20725,8 @@
+ 
  ACE_INLINE CORBA::Boolean
  operator<< (
-     TAO_OutputCDR &,
+-    TAO_OutputCDR &,
 -    const IR::ValueDef_ptr
-+    const IR_ValueDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::ValueDef_ptr &
-+    IR_ValueDef_ptr &
-   );
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
+-  );
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
      TAO_OutputCDR &strm,
 -    const IR::ValueDef_ptr _tao_objref
 +    const IR_ValueDef_ptr _tao_objref
    )
  {
    CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -22611,7 +21474,7 @@
+@@ -22611,7 +20736,7 @@
  ACE_INLINE CORBA::Boolean
  operator>> (
      TAO_InputCDR &strm,
@@ -26862,7 +26805,7 @@
    )
  {
    ACE_TRY_NEW_ENV
-@@ -22621,7 +21484,7 @@
+@@ -22621,7 +20746,7 @@
        return 0;
      // narrow to the right type
      _tao_objref =
@@ -26871,7 +26814,7 @@
            obj.in (),
            ACE_TRY_ENV
          );
-@@ -22636,7 +21499,7 @@
+@@ -22636,7 +20761,7 @@
    return 0;
  }
  
@@ -26880,7 +26823,7 @@
  {
    if (
      (strm << _tao_aggregate.name.in ()) &&
-@@ -22661,7 +21524,7 @@
+@@ -22661,7 +20786,7 @@
    
  }
  
@@ -26889,29 +26832,28 @@
  {
    if (
      (strm >> _tao_aggregate.name.out ()) &&
-@@ -22689,18 +21552,18 @@
+@@ -22688,19 +20813,8 @@
+ 
  ACE_INLINE CORBA::Boolean
  operator<< (
-     TAO_OutputCDR &,
+-    TAO_OutputCDR &,
 -    const IR::ValueBoxDef_ptr
-+    const IR_ValueBoxDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::ValueBoxDef_ptr &
-+    IR_ValueBoxDef_ptr &
-   );
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
+-  );
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
      TAO_OutputCDR &strm,
 -    const IR::ValueBoxDef_ptr _tao_objref
 +    const IR_ValueBoxDef_ptr _tao_objref
    )
  {
    CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -22710,7 +21573,7 @@
+@@ -22710,7 +20824,7 @@
  ACE_INLINE CORBA::Boolean
  operator>> (
      TAO_InputCDR &strm,
@@ -26920,7 +26862,7 @@
    )
  {
    ACE_TRY_NEW_ENV
-@@ -22720,7 +21583,7 @@
+@@ -22720,7 +20834,7 @@
        return 0;
      // narrow to the right type
      _tao_objref =
@@ -26929,29 +26871,28 @@
            obj.in (),
            ACE_TRY_ENV
          );
-@@ -22738,18 +21601,18 @@
+@@ -22737,19 +20851,8 @@
+ 
  ACE_INLINE CORBA::Boolean
  operator<< (
-     TAO_OutputCDR &,
+-    TAO_OutputCDR &,
 -    const IR::ProvidesDef_ptr
-+    const IR_ProvidesDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::ProvidesDef_ptr &
-+    IR_ProvidesDef_ptr &
-   );
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
+-  );
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
      TAO_OutputCDR &strm,
 -    const IR::ProvidesDef_ptr _tao_objref
 +    const IR_ProvidesDef_ptr _tao_objref
    )
  {
    CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -22759,7 +21622,7 @@
+@@ -22759,7 +20862,7 @@
  ACE_INLINE CORBA::Boolean
  operator>> (
      TAO_InputCDR &strm,
@@ -26960,7 +26901,7 @@
    )
  {
    ACE_TRY_NEW_ENV
-@@ -22769,7 +21632,7 @@
+@@ -22769,7 +20872,7 @@
        return 0;
      // narrow to the right type
      _tao_objref =
@@ -26969,7 +26910,7 @@
            obj.in (),
            ACE_TRY_ENV
          );
-@@ -22784,7 +21647,7 @@
+@@ -22784,7 +20887,7 @@
    return 0;
  }
  
@@ -26978,7 +26919,7 @@
  {
    if (
      (strm << _tao_aggregate.name.in ()) &&
-@@ -22799,7 +21662,7 @@
+@@ -22799,7 +20902,7 @@
    
  }
  
@@ -26987,29 +26928,28 @@
  {
    if (
      (strm >> _tao_aggregate.name.out ()) &&
-@@ -22817,18 +21680,18 @@
+@@ -22816,19 +20919,8 @@
+ 
  ACE_INLINE CORBA::Boolean
  operator<< (
-     TAO_OutputCDR &,
+-    TAO_OutputCDR &,
 -    const IR::UsesDef_ptr
-+    const IR_UsesDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::UsesDef_ptr &
-+    IR_UsesDef_ptr &
-   );
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
+-  );
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
      TAO_OutputCDR &strm,
 -    const IR::UsesDef_ptr _tao_objref
 +    const IR_UsesDef_ptr _tao_objref
    )
  {
    CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -22838,7 +21701,7 @@
+@@ -22838,7 +20930,7 @@
  ACE_INLINE CORBA::Boolean
  operator>> (
      TAO_InputCDR &strm,
@@ -27018,7 +26958,7 @@
    )
  {
    ACE_TRY_NEW_ENV
-@@ -22848,7 +21711,7 @@
+@@ -22848,7 +20940,7 @@
        return 0;
      // narrow to the right type
      _tao_objref =
@@ -27027,7 +26967,7 @@
            obj.in (),
            ACE_TRY_ENV
          );
-@@ -22863,7 +21726,7 @@
+@@ -22863,7 +20955,7 @@
    return 0;
  }
  
@@ -27036,7 +26976,7 @@
  {
    if (
      (strm << _tao_aggregate.name.in ()) &&
-@@ -22879,7 +21742,7 @@
+@@ -22879,7 +20971,7 @@
    
  }
  
@@ -27045,54 +26985,53 @@
  {
    if (
      (strm >> _tao_aggregate.name.out ()) &&
-@@ -22899,13 +21762,13 @@
- #if !defined _TAO_CDR_OP_IR_ProvidesDescSeq_I_
- #define _TAO_CDR_OP_IR_ProvidesDescSeq_I_
+@@ -22895,51 +20987,28 @@
+   
+ }
  
--CORBA::Boolean TAO_Export operator<< (
-+CORBA::Boolean  operator<< (
+-
+-#if !defined _TAO_CDR_OP_IR_ProvidesDescSeq_I_
+-#define _TAO_CDR_OP_IR_ProvidesDescSeq_I_
+-
+ CORBA::Boolean TAO_Export operator<< (
      TAO_OutputCDR &,
 -    const IR::ProvidesDescSeq &
 +    const IR_ProvidesDescSeq &
    );
--CORBA::Boolean TAO_Export operator>> (
-+CORBA::Boolean  operator>> (
+ CORBA::Boolean TAO_Export operator>> (
      TAO_InputCDR &,
 -    IR::ProvidesDescSeq &
 +    IR_ProvidesDescSeq &
    );
  
- #endif /* _TAO_CDR_OP_IR_ProvidesDescSeq_I_ */
-@@ -22914,13 +21777,13 @@
- #if !defined _TAO_CDR_OP_IR_UsesDescSeq_I_
- #define _TAO_CDR_OP_IR_UsesDescSeq_I_
- 
--CORBA::Boolean TAO_Export operator<< (
-+CORBA::Boolean  operator<< (
+-#endif /* _TAO_CDR_OP_IR_ProvidesDescSeq_I_ */
+-
+-
+-#if !defined _TAO_CDR_OP_IR_UsesDescSeq_I_
+-#define _TAO_CDR_OP_IR_UsesDescSeq_I_
+-
+ CORBA::Boolean TAO_Export operator<< (
      TAO_OutputCDR &,
 -    const IR::UsesDescSeq &
 +    const IR_UsesDescSeq &
    );
--CORBA::Boolean TAO_Export operator>> (
-+CORBA::Boolean  operator>> (
+ CORBA::Boolean TAO_Export operator>> (
      TAO_InputCDR &,
 -    IR::UsesDescSeq &
-+    IR_UsesDescSeq &
-   );
- 
- #endif /* _TAO_CDR_OP_IR_UsesDescSeq_I_ */
-@@ -22928,18 +21791,18 @@
- ACE_INLINE CORBA::Boolean
- operator<< (
-     TAO_OutputCDR &,
+-  );
+-
+-#endif /* _TAO_CDR_OP_IR_UsesDescSeq_I_ */
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
+-    TAO_OutputCDR &,
 -    const IR::EventDef_ptr
-+    const IR_EventDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::EventDef_ptr &
-+    IR_EventDef_ptr &
++    IR_UsesDescSeq &
    );
  
  ACE_INLINE CORBA::Boolean
@@ -27103,7 +27042,7 @@
    )
  {
    CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -22949,7 +21812,7 @@
+@@ -22949,7 +21018,7 @@
  ACE_INLINE CORBA::Boolean
  operator>> (
      TAO_InputCDR &strm,
@@ -27112,7 +27051,7 @@
    )
  {
    ACE_TRY_NEW_ENV
-@@ -22959,7 +21822,7 @@
+@@ -22959,7 +21028,7 @@
        return 0;
      // narrow to the right type
      _tao_objref =
@@ -27121,7 +27060,7 @@
            obj.in (),
            ACE_TRY_ENV
          );
-@@ -22974,7 +21837,7 @@
+@@ -22974,7 +21043,7 @@
    return 0;
  }
  
@@ -27130,7 +27069,7 @@
  {
    if (
      (strm << _tao_aggregate.name.in ()) &&
-@@ -22989,7 +21852,7 @@
+@@ -22989,7 +21058,7 @@
    
  }
  
@@ -27139,29 +27078,28 @@
  {
    if (
      (strm >> _tao_aggregate.name.out ()) &&
-@@ -23007,18 +21870,18 @@
+@@ -23006,19 +21075,8 @@
+ 
  ACE_INLINE CORBA::Boolean
  operator<< (
-     TAO_OutputCDR &,
+-    TAO_OutputCDR &,
 -    const IR::EmitsDef_ptr
-+    const IR_EmitsDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::EmitsDef_ptr &
-+    IR_EmitsDef_ptr &
-   );
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
+-  );
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
      TAO_OutputCDR &strm,
 -    const IR::EmitsDef_ptr _tao_objref
 +    const IR_EmitsDef_ptr _tao_objref
    )
  {
    CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -23028,7 +21891,7 @@
+@@ -23028,7 +21086,7 @@
  ACE_INLINE CORBA::Boolean
  operator>> (
      TAO_InputCDR &strm,
@@ -27170,7 +27108,7 @@
    )
  {
    ACE_TRY_NEW_ENV
-@@ -23038,7 +21901,7 @@
+@@ -23038,7 +21096,7 @@
        return 0;
      // narrow to the right type
      _tao_objref =
@@ -27179,29 +27117,28 @@
            obj.in (),
            ACE_TRY_ENV
          );
-@@ -23056,18 +21919,18 @@
+@@ -23055,19 +21113,8 @@
+ 
  ACE_INLINE CORBA::Boolean
  operator<< (
-     TAO_OutputCDR &,
+-    TAO_OutputCDR &,
 -    const IR::PublishesDef_ptr
-+    const IR_PublishesDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::PublishesDef_ptr &
-+    IR_PublishesDef_ptr &
-   );
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
+-  );
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
      TAO_OutputCDR &strm,
 -    const IR::PublishesDef_ptr _tao_objref
 +    const IR_PublishesDef_ptr _tao_objref
    )
  {
    CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -23077,7 +21940,7 @@
+@@ -23077,7 +21124,7 @@
  ACE_INLINE CORBA::Boolean
  operator>> (
      TAO_InputCDR &strm,
@@ -27210,7 +27147,7 @@
    )
  {
    ACE_TRY_NEW_ENV
-@@ -23087,7 +21950,7 @@
+@@ -23087,7 +21134,7 @@
        return 0;
      // narrow to the right type
      _tao_objref =
@@ -27219,29 +27156,28 @@
            obj.in (),
            ACE_TRY_ENV
          );
-@@ -23105,18 +21968,18 @@
+@@ -23104,19 +21151,8 @@
+ 
  ACE_INLINE CORBA::Boolean
  operator<< (
-     TAO_OutputCDR &,
+-    TAO_OutputCDR &,
 -    const IR::ConsumesDef_ptr
-+    const IR_ConsumesDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::ConsumesDef_ptr &
-+    IR_ConsumesDef_ptr &
-   );
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
+-  );
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
      TAO_OutputCDR &strm,
 -    const IR::ConsumesDef_ptr _tao_objref
 +    const IR_ConsumesDef_ptr _tao_objref
    )
  {
    CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -23126,7 +21989,7 @@
+@@ -23126,7 +21162,7 @@
  ACE_INLINE CORBA::Boolean
  operator>> (
      TAO_InputCDR &strm,
@@ -27250,7 +27186,7 @@
    )
  {
    ACE_TRY_NEW_ENV
-@@ -23136,7 +21999,7 @@
+@@ -23136,7 +21172,7 @@
        return 0;
      // narrow to the right type
      _tao_objref =
@@ -27259,29 +27195,28 @@
            obj.in (),
            ACE_TRY_ENV
          );
-@@ -23154,18 +22017,18 @@
+@@ -23153,19 +21189,8 @@
+ 
  ACE_INLINE CORBA::Boolean
  operator<< (
-     TAO_OutputCDR &,
+-    TAO_OutputCDR &,
 -    const IR::ComponentDef_ptr
-+    const IR_ComponentDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::ComponentDef_ptr &
-+    IR_ComponentDef_ptr &
-   );
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
+-  );
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
      TAO_OutputCDR &strm,
 -    const IR::ComponentDef_ptr _tao_objref
 +    const IR_ComponentDef_ptr _tao_objref
    )
  {
    CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -23175,7 +22038,7 @@
+@@ -23175,7 +21200,7 @@
  ACE_INLINE CORBA::Boolean
  operator>> (
      TAO_InputCDR &strm,
@@ -27290,7 +27225,7 @@
    )
  {
    ACE_TRY_NEW_ENV
-@@ -23185,7 +22048,7 @@
+@@ -23185,7 +21210,7 @@
        return 0;
      // narrow to the right type
      _tao_objref =
@@ -27299,7 +27234,7 @@
            obj.in (),
            ACE_TRY_ENV
          );
-@@ -23200,7 +22063,7 @@
+@@ -23200,7 +21225,7 @@
    return 0;
  }
  
@@ -27308,7 +27243,7 @@
  {
    if (
      (strm << _tao_aggregate.name.in ()) &&
-@@ -23223,7 +22086,7 @@
+@@ -23223,7 +21248,7 @@
    
  }
  
@@ -27317,29 +27252,28 @@
  {
    if (
      (strm >> _tao_aggregate.name.out ()) &&
-@@ -23249,18 +22112,18 @@
+@@ -23248,19 +21273,8 @@
+ 
  ACE_INLINE CORBA::Boolean
  operator<< (
-     TAO_OutputCDR &,
+-    TAO_OutputCDR &,
 -    const IR::PrimaryKeyDef_ptr
-+    const IR_PrimaryKeyDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::PrimaryKeyDef_ptr &
-+    IR_PrimaryKeyDef_ptr &
-   );
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
+-  );
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
      TAO_OutputCDR &strm,
 -    const IR::PrimaryKeyDef_ptr _tao_objref
 +    const IR_PrimaryKeyDef_ptr _tao_objref
    )
  {
    CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -23270,7 +22133,7 @@
+@@ -23270,7 +21284,7 @@
  ACE_INLINE CORBA::Boolean
  operator>> (
      TAO_InputCDR &strm,
@@ -27348,7 +27282,7 @@
    )
  {
    ACE_TRY_NEW_ENV
-@@ -23280,7 +22143,7 @@
+@@ -23280,7 +21294,7 @@
        return 0;
      // narrow to the right type
      _tao_objref =
@@ -27357,7 +27291,7 @@
            obj.in (),
            ACE_TRY_ENV
          );
-@@ -23295,7 +22158,7 @@
+@@ -23295,7 +21309,7 @@
    return 0;
  }
  
@@ -27366,7 +27300,7 @@
  {
    if (
      (strm << _tao_aggregate.name.in ()) &&
-@@ -23310,7 +22173,7 @@
+@@ -23310,7 +21324,7 @@
    
  }
  
@@ -27375,29 +27309,28 @@
  {
    if (
      (strm >> _tao_aggregate.name.out ()) &&
-@@ -23328,18 +22191,18 @@
+@@ -23327,19 +21341,8 @@
+ 
  ACE_INLINE CORBA::Boolean
  operator<< (
-     TAO_OutputCDR &,
+-    TAO_OutputCDR &,
 -    const IR::FactoryDef_ptr
-+    const IR_FactoryDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::FactoryDef_ptr &
-+    IR_FactoryDef_ptr &
-   );
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
+-  );
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
      TAO_OutputCDR &strm,
 -    const IR::FactoryDef_ptr _tao_objref
 +    const IR_FactoryDef_ptr _tao_objref
    )
  {
    CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -23349,7 +22212,7 @@
+@@ -23349,7 +21352,7 @@
  ACE_INLINE CORBA::Boolean
  operator>> (
      TAO_InputCDR &strm,
@@ -27406,7 +27339,7 @@
    )
  {
    ACE_TRY_NEW_ENV
-@@ -23359,7 +22222,7 @@
+@@ -23359,7 +21362,7 @@
        return 0;
      // narrow to the right type
      _tao_objref =
@@ -27415,29 +27348,28 @@
            obj.in (),
            ACE_TRY_ENV
          );
-@@ -23377,18 +22240,18 @@
+@@ -23376,19 +21379,8 @@
+ 
  ACE_INLINE CORBA::Boolean
  operator<< (
-     TAO_OutputCDR &,
+-    TAO_OutputCDR &,
 -    const IR::FinderDef_ptr
-+    const IR_FinderDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::FinderDef_ptr &
-+    IR_FinderDef_ptr &
-   );
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
+-  );
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
      TAO_OutputCDR &strm,
 -    const IR::FinderDef_ptr _tao_objref
 +    const IR_FinderDef_ptr _tao_objref
    )
  {
    CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -23398,7 +22261,7 @@
+@@ -23398,7 +21390,7 @@
  ACE_INLINE CORBA::Boolean
  operator>> (
      TAO_InputCDR &strm,
@@ -27446,7 +27378,7 @@
    )
  {
    ACE_TRY_NEW_ENV
-@@ -23408,7 +22271,7 @@
+@@ -23408,7 +21400,7 @@
        return 0;
      // narrow to the right type
      _tao_objref =
@@ -27455,29 +27387,28 @@
            obj.in (),
            ACE_TRY_ENV
          );
-@@ -23426,18 +22289,18 @@
+@@ -23425,19 +21417,8 @@
+ 
  ACE_INLINE CORBA::Boolean
  operator<< (
-     TAO_OutputCDR &,
+-    TAO_OutputCDR &,
 -    const IR::HomeDef_ptr
-+    const IR_HomeDef_ptr
-   );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
+-  );
+-ACE_INLINE CORBA::Boolean
+-operator>> (
+-    TAO_InputCDR &,
 -    IR::HomeDef_ptr &
-+    IR_HomeDef_ptr &
-   );
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
+-  );
+-
+-ACE_INLINE CORBA::Boolean
+-operator<< (
      TAO_OutputCDR &strm,
 -    const IR::HomeDef_ptr _tao_objref
 +    const IR_HomeDef_ptr _tao_objref
    )
  {
    CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -23447,7 +22310,7 @@
+@@ -23447,7 +21428,7 @@
  ACE_INLINE CORBA::Boolean
  operator>> (
      TAO_InputCDR &strm,
@@ -27486,7 +27417,7 @@
    )
  {
    ACE_TRY_NEW_ENV
-@@ -23457,7 +22320,7 @@
+@@ -23457,7 +21438,7 @@
        return 0;
      // narrow to the right type
      _tao_objref =
@@ -27495,7 +27426,7 @@
            obj.in (),
            ACE_TRY_ENV
          );
-@@ -23472,7 +22335,7 @@
+@@ -23472,7 +21453,7 @@
    return 0;
  }
  
@@ -27504,7 +27435,7 @@
  {
    if (
      (strm << _tao_aggregate.name.in ()) &&
-@@ -23494,7 +22357,7 @@
+@@ -23494,7 +21475,7 @@
    
  }